Use ecore_evas_screen_geometry_get() to retrieve desktop size

Replaced all ecore_x calls to get desktop size to use ecore_evas_screen_geometry_get() instead.

Signed-off-by: Jimmy Huang <jimmy.huang@intel.com>

diff --git a/src/_logic.c b/src/_logic.c
index 2c02838..1cbdd5a 100755 (executable)
--- a/src/_logic.c
+++ b/src/_logic.c
@@ -186,12 +186,11 @@ int _app_create(struct appdata *ad)
 
 static void _get_win_geometry(struct appdata *ad)
 {
-       Ecore_X_Window focus_win;
-       Ecore_X_Window root_win;
-
-       focus_win = ecore_x_window_focus_get();
-       root_win = ecore_x_window_root_get(focus_win);
-       ecore_x_window_size_get(root_win, &ad->root_w, &ad->root_h);
+       Evas_Object *eo;
+       Ecore_Evas *ee;
+ 
+       ee = ecore_evas_ecore_evas_get(evas_object_evas_get(ad->win));
+       ecore_evas_screen_geometry_get(ee, 0, 0, &ad->root_w, &ad->root_h);
 }
 
 static void _vconf_noti_cb(keynode_t *node, void *data)

diff --git a/src/_util_efl.c b/src/_util_efl.c
index 9f8d71a..6c1f8b5 100644 (file)
--- a/src/_util_efl.c
+++ b/src/_util_efl.c
@@ -27,14 +27,16 @@
 Evas_Object *_add_window(const char *name)
 {
        Evas_Object *eo;
+       Ecore_Evas *ee;
        int w, h;
 
        eo = elm_win_add(NULL, name, ELM_WIN_BASIC);
        if (eo) {
                elm_win_title_set(eo, name);
                elm_win_borderless_set(eo, EINA_TRUE);
-               ecore_x_window_size_get(ecore_x_window_root_first_get(),
-                                       &w, &h);
+               ee = ecore_evas_ecore_evas_get(evas_object_evas_get(eo));
+               ecore_evas_screen_geometry_get(ee, 0, 0, &w, &h);
+
                evas_object_resize(eo, w, h);
        }