elm_conform : add evas_object_smart_callback_del_full 60/43060/3
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 7 Jul 2015 10:13:35 +0000 (19:13 +0900)
committerGwanglim Lee <gl77.lee@samsung.com>
Tue, 7 Jul 2015 11:09:22 +0000 (04:09 -0700)
and add tizen only code.
@tizen_fix

Change-Id: I9ffd395f2b225eca4f90f5a1e284d611136b4ea8

src/lib/elm_conform.c

index 8c448f3c36cf84e3982dee7ab4d54fe72335d908..32d311792a6e730596bbd535ee8c4c35987badd8 100644 (file)
@@ -127,9 +127,11 @@ _conformant_part_sizing_eval(Evas_Object *obj,
    Ecore_X_Window zone = 0;
    Ecore_X_Window xwin;
 #endif
+// TIZEN_ONLY(20150707): implemented elm_win_conformant_set/get for wayland
 #ifdef HAVE_ELEMENTARY_WAYLAND
    Ecore_Wl_Window *wlwin;
 #endif
+//
    Evas_Object *top;
    int sx = -1, sy = -1, sw = -1, sh = -1;
 
@@ -156,11 +158,13 @@ _conformant_part_sizing_eval(Evas_Object *obj,
                sx = sy = sw = sh = 0;
           }
 #endif
+// TIZEN_ONLY(20150707): implemented elm_win_conformant_set/get for wayland
 #ifdef HAVE_ELEMENTARY_WAYLAND
         wlwin = elm_win_wl_window_get(top);
         if (wlwin)
           ecore_wl_window_indicator_geometry_get(wlwin, &sx, &sy, &sw, &sh);
 #endif
+//
         if (((sd->rot == 90) || (sd->rot == 270)) && sd->landscape_indicator)
           _conformant_part_size_hints_set(obj, sd->landscape_indicator, sx, sy, sw, sh);
         else if (((sd->rot == 0) || (sd->rot == 180)) && sd->portrait_indicator)
@@ -189,11 +193,13 @@ _conformant_part_sizing_eval(Evas_Object *obj,
                }
           }
 #endif
+// TIZEN_ONLY(20150707): implemented elm_win_conformant_set/get for wayland
 #ifdef HAVE_ELEMENTARY_WAYLAND
         wlwin = elm_win_wl_window_get(top);
         if (wlwin)
           ecore_wl_window_keyboard_geometry_get(wlwin, &sx, &sy, &sw, &sh);
 #endif
+//
         DBG("[KEYPAD]: size(%d,%d, %dx%d).", sx, sy, sw, sh);
         _conformant_part_size_hints_set
           (obj, sd->virtualkeypad, sx, sy, sw, sh);
@@ -904,6 +910,7 @@ _on_prop_change(void *data,
 
 #endif
 
+// TIZEN_ONLY(20150707): implemented elm_win_conformant_set/get for wayland
 static void
 _on_conformant_changed(void *data,
                      Evas_Object *obj,
@@ -916,6 +923,7 @@ _on_conformant_changed(void *data,
 
    _conformant_part_sizing_eval(data, part_type);
 }
+//
 
 EOLIAN static void
 _elm_conformant_evas_object_smart_add(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED)
@@ -957,6 +965,10 @@ _elm_conformant_evas_object_smart_del(Eo *obj, Elm_Conformant_Data *sd)
      (sd->win, "indicator,prop,changed", _on_indicator_mode_changed, obj);
    evas_object_smart_callback_del_full
      (sd->win, "rotation,changed", _on_rotation_changed, obj);
+   // TIZEN_ONLY(20150707): implemented elm_win_conformant_set/get for wayland
+   evas_object_smart_callback_del_full
+     (sd->win, "conformant,changed", _on_conformant_changed, obj);
+   //
 
    eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
 }
@@ -1016,8 +1028,10 @@ _elm_conformant_eo_base_constructor(Eo *obj, Elm_Conformant_Data *sd)
      (sd->win, "indicator,prop,changed", _on_indicator_mode_changed, obj);
    evas_object_smart_callback_add
      (sd->win, "rotation,changed", _on_rotation_changed, obj);
+   // TIZEN_ONLY(20150707): implemented elm_win_conformant_set/get for wayland
    evas_object_smart_callback_add
      (sd->win, "conformant,changed", _on_conformant_changed, obj);
+   //
 }
 
 static void