fix for applying wayland (removing X)

[apps/home/settings.git] / setting-common / src / setting-common-draw-naviframe.c

diff --git a/setting-common/src/setting-common-draw-naviframe.c b/setting-common/src/setting-common-draw-naviframe.c
index 580297e..f4d360e 100755 (executable)
--- a/setting-common/src/setting-common-draw-naviframe.c
+++ b/setting-common/src/setting-common-draw-naviframe.c
@@ -20,8 +20,6 @@
  */
 #include <setting-common-draw-widget.h>
 #include <glib.h>
-#include <utilX.h>
-#include <Ecore_X.h>
 #include <Elementary.h>
 #include <efl_assist.h>
 
@@ -254,7 +252,8 @@ static void __rotate_ctxpopup_cb(void *data, Evas_Object *obj, void *event_info)
        Setting_Btn_Data *btn_data = (Setting_Btn_Data *)data;
        Evas_Coord w, h;
        int pos = -1;
-       ecore_x_window_size_get(ecore_x_window_root_first_get(), &w, &h);
+#if 0
+       //ecore_x_window_size_get(ecore_x_window_root_first_get(), &w, &h);
        pos = elm_win_rotation_get(ug_get_window());
        SETTING_TRACE_DEBUG("pos: %d, w: %d, h: %d", pos, w, h);
        if (pos == 90) {
@@ -264,6 +263,7 @@ static void __rotate_ctxpopup_cb(void *data, Evas_Object *obj, void *event_info)
        } else {
                evas_object_move(btn_data->ctxpopup, 0, h);
        }
+#endif
 }
 
 static void __ctxpopup_lang_change_cb(keynode_t *key, void *data)
@@ -308,9 +308,11 @@ static Eina_Bool __ctxpopup_key_press_cb(void *data, int type, void *event)
        SETTING_TRACE("Pressed %s", ev->keyname);
        Evas_Object *ctxpopup = data;
 
+       #if 0
        if (!strcmp(ev->keyname, KEY_HOME)) {
                elm_ctxpopup_dismiss(ctxpopup);
        }
+       #endif
        return ECORE_CALLBACK_RENEW;
 }
 
@@ -358,6 +360,7 @@ EXPORT_PUBLIC void setting_create_more_btn_click_cb(void *data, Evas_Object *obj
 
        Evas_Coord w , h;
 
+#if 0
        int pos = -1;
        ecore_x_window_size_get(ecore_x_window_root_first_get(), &w, &h);
        pos = elm_win_rotation_get(ug_get_window());
@@ -368,6 +371,7 @@ EXPORT_PUBLIC void setting_create_more_btn_click_cb(void *data, Evas_Object *obj
        } else {
                evas_object_move(ctxpopup, 0, h);
        }
+#endif
        evas_object_show(ctxpopup);
 }
 
@@ -429,7 +433,7 @@ Elm_Object_Item *setting_create_guild_layout(Evas_Object *navi_bar,
 {
        Evas_Object *scroller = elm_genlist_add(navi_bar);
        retvm_if(scroller == NULL, NULL, "Cannot set scroller object  as contento of layout");
-       elm_genlist_realization_mode_set(scroller, EINA_TRUE);
+       //elm_genlist_realization_mode_set(scroller, EINA_TRUE);
        elm_object_style_set(scroller, "dialogue");
        elm_genlist_clear(scroller);    /* first to clear list */
        elm_genlist_mode_set(scroller, ELM_LIST_COMPRESS);
@@ -966,7 +970,7 @@ Evas_Object *setting_create_layout_navi_bar_genlist(Evas_Object *win_layout,
        *genlist = elm_genlist_add(*navi_bar);
        retvm_if(*genlist == NULL, NULL,
                 "Cannot set scroller object as contento of layout");
-       elm_genlist_realization_mode_set(*genlist, EINA_TRUE);
+       //elm_genlist_realization_mode_set(*genlist, EINA_TRUE);
        elm_object_style_set(*genlist, "dialogue");
        elm_genlist_clear(*genlist);    /* first to clear list */
        evas_object_smart_callback_add(*genlist, "realized", __gl_realized_cb, NULL);
@@ -1214,7 +1218,7 @@ setting_push_layout_navi_bar_genlist(Evas_Object *win_layout,
                *genlist = elm_genlist_add(navi_bar);
                retvm_if(*genlist == NULL, NULL,
                         "Cannot set scroller object  as contento of layout");
-               elm_genlist_realization_mode_set(*genlist, EINA_TRUE);
+               //elm_genlist_realization_mode_set(*genlist, EINA_TRUE);
                gl = *genlist;
                elm_object_style_set(*genlist, "dialogue");
                elm_genlist_clear(gl);  /* first to clear list */