aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/extantz/extantz.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/extantz/extantz.c')
-rw-r--r--src/extantz/extantz.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c
index ff418c0..fa38251 100644
--- a/src/extantz/extantz.c
+++ b/src/extantz/extantz.c
@@ -606,8 +606,6 @@ EAPI_MAIN int elm_main(int argc, char **argv)
606 ourGlobals.ee = ecore_evas_ecore_evas_get(ourGlobals.evas); // Only use this on Evas that was created with Ecore_Evas. 606 ourGlobals.ee = ecore_evas_ecore_evas_get(ourGlobals.evas); // Only use this on Evas that was created with Ecore_Evas.
607#endif 607#endif
608 608
609 evas_object_event_callback_add(ourGlobals.win, EVAS_CALLBACK_RESIZE, _on_resize, &ourGlobals);
610
611 // Get the screen size. 609 // Get the screen size.
612 elm_win_screen_size_get(ourGlobals.win, &ourGlobals.win_x, &ourGlobals.win_y, &ourGlobals.scr_w, &ourGlobals.scr_h); 610 elm_win_screen_size_get(ourGlobals.win, &ourGlobals.win_x, &ourGlobals.win_y, &ourGlobals.scr_w, &ourGlobals.scr_h);
613 ourGlobals.win_x = ourGlobals.win_x + (ourGlobals.scr_w / 3); 611 ourGlobals.win_x = ourGlobals.win_x + (ourGlobals.scr_w / 3);
@@ -616,6 +614,8 @@ EAPI_MAIN int elm_main(int argc, char **argv)
616 evas_object_move(ourGlobals.win, ourGlobals.win_x, ourGlobals.win_y); 614 evas_object_move(ourGlobals.win, ourGlobals.win_x, ourGlobals.win_y);
617 evas_object_resize(ourGlobals.win, ourGlobals.win_w, ourGlobals.win_h); 615 evas_object_resize(ourGlobals.win, ourGlobals.win_w, ourGlobals.win_h);
618 616
617 evas_object_event_callback_add(ourGlobals.win, EVAS_CALLBACK_RESIZE, _on_resize, &ourGlobals);
618
619 /* Our "layers". TODO - This is out of date, I should update it. 619 /* Our "layers". TODO - This is out of date, I should update it.
620 620
621 Elm win - our real main window 621 Elm win - our real main window
@@ -694,7 +694,9 @@ EAPI_MAIN int elm_main(int argc, char **argv)
694 694
695 if (ourGlobals.win) 695 if (ourGlobals.win)
696 { 696 {
697 ecore_animator_del(ourGlobals.animator);
697 Evas_3D_Demo_fini(&ourGlobals); 698 Evas_3D_Demo_fini(&ourGlobals);
699 scenriDel(ourGlobals.scene);
698 eo_unref(ourGlobals.tb); 700 eo_unref(ourGlobals.tb);
699 winFangDel(ourGlobals.mainWindow); 701 winFangDel(ourGlobals.mainWindow);
700 } 702 }