[entry] fixed bug in non-editable entry selection handlers and fixed migration issue

[framework/uifw/elementary.git] / src / lib / elm_panes.c

diff --git a/src/lib/elm_panes.c b/src/lib/elm_panes.c
index 569a9de..6e817fc 100644 (file)
--- a/src/lib/elm_panes.c
+++ b/src/lib/elm_panes.c
@@ -89,13 +89,9 @@ _theme_hook(Evas_Object *obj)
      edje_object_part_swallow(wd->panes, "elm.swallow.left", wd->contents.left);
    if (wd->contents.right)
      edje_object_part_swallow(wd->panes, "elm.swallow.right", wd->contents.right);
-<<<<<<< HEAD
-   if(wd->contents.left && wd->contents.right)
+   if (wd->contents.left && wd->contents.right)
      edje_object_signal_emit(wd->panes, "elm.panes.pair", "elm");
-   if(wd->fixed)
-=======
    if (wd->fixed)
->>>>>>> remotes/origin/upstream
      edje_object_signal_emit(wd->panes, "elm.panes.fixed", "elm");
 
    edje_object_scale_set(wd->panes, elm_widget_scale_get(obj) *
@@ -172,6 +168,7 @@ _sub_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
      {
         evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
                                             _changed_size_hints, obj);
+        edje_object_part_unswallow(wd->panes, sub);
         wd->contents.left = NULL;
         _sizing_eval(obj);
      }
@@ -179,15 +176,12 @@ _sub_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
      {
         evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
                                             _changed_size_hints, obj);
+        edje_object_part_unswallow(wd->panes, sub);
         wd->contents.right= NULL;
         _sizing_eval(obj);
      }
 }
 
-<<<<<<< HEAD
-=======
-
->>>>>>> remotes/origin/upstream
 static void
 _clicked(void *data, Evas_Object *obj __UNUSED__ , const char *emission __UNUSED__, const char *source __UNUSED__)
 {
@@ -225,25 +219,19 @@ static void
 _content_left_set(Evas_Object *obj, Evas_Object *content)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
+   if (wd->contents.left == content) return;
    if (wd->contents.left)
      {
         evas_object_del(wd->contents.left);
-        wd->contents.left = NULL;
-<<<<<<< HEAD
         edje_object_signal_emit(wd->panes, "elm.panes.unpair", "elm");
-=======
->>>>>>> remotes/origin/upstream
      }
+   wd->contents.left = content;
    if (content)
      {
-        wd->contents.left = content;
         elm_widget_sub_object_add(obj, content);
         edje_object_part_swallow(wd->panes, "elm.swallow.left", content);
-<<<<<<< HEAD
         if (wd->contents.right)
           edje_object_signal_emit(wd->panes, "elm.panes.pair", "elm");
-=======
->>>>>>> remotes/origin/upstream
      }
 }
 
@@ -251,25 +239,19 @@ static void
 _content_right_set(Evas_Object *obj, Evas_Object *content)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
+   if (wd->contents.right == content) return;
    if (wd->contents.right)
      {
         evas_object_del(wd->contents.right);
-        wd->contents.right = NULL;
-<<<<<<< HEAD
         edje_object_signal_emit(wd->panes, "elm.panes.unpair", "elm");
-=======
->>>>>>> remotes/origin/upstream
      }
+   wd->contents.right = content;
    if (content)
      {
-        wd->contents.right = content;
         elm_widget_sub_object_add(obj, content);
         edje_object_part_swallow(wd->panes, "elm.swallow.right", content);
-<<<<<<< HEAD
         if (wd->contents.left)
           edje_object_signal_emit(wd->panes, "elm.panes.pair", "elm");
-=======
->>>>>>> remotes/origin/upstream
      }
 }
 
@@ -279,18 +261,8 @@ _content_left_unset(Evas_Object *obj)
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd->contents.left) return NULL;
    Evas_Object *content = wd->contents.left;
-<<<<<<< HEAD
-
-   edje_object_part_unswallow(wd->panes, content);
-   evas_object_hide(wd->contents.left);
    elm_widget_sub_object_del(obj, content);
-   wd->contents.left = NULL;
    edje_object_signal_emit(wd->panes, "elm.panes.unpair", "elm");
-=======
-   elm_widget_sub_object_del(obj, content);
-   edje_object_part_unswallow(wd->panes, content);
-   wd->contents.left = NULL;
->>>>>>> remotes/origin/upstream
    return content;
 }
 
@@ -300,18 +272,8 @@ _content_right_unset(Evas_Object *obj)
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd->contents.right) return NULL;
    Evas_Object *content = wd->contents.right;
-<<<<<<< HEAD
-
-   edje_object_part_unswallow(wd->panes, content);
-   evas_object_hide(wd->contents.right);
    elm_widget_sub_object_del(obj, content);
-   wd->contents.right = NULL;
    edje_object_signal_emit(wd->panes, "elm.panes.unpair", "elm");
-=======
-   elm_widget_sub_object_del(obj, content);
-   edje_object_part_unswallow(wd->panes, content);
-   wd->contents.right = NULL;
->>>>>>> remotes/origin/upstream
    return content;
 }
 
@@ -324,7 +286,7 @@ _content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content)
    if (part && (!strncmp(part, "elm.swallow.", 12))) part += 12;
    if (!part || !strcmp(part, "left"))
      _content_left_set(obj, content);
-   else if(!strcmp(part, "right"))
+   else if (!strcmp(part, "right"))
      _content_right_set(obj, content);
 }
 
@@ -404,61 +366,37 @@ elm_panes_add(Evas_Object *parent)
    return obj;
 }
 
-<<<<<<< HEAD
-EAPI void
-=======
 EINA_DEPRECATED EAPI void
->>>>>>> remotes/origin/upstream
 elm_panes_content_left_set(Evas_Object *obj, Evas_Object *content)
 {
    _content_set_hook(obj, "left", content);
 }
 
-<<<<<<< HEAD
-EAPI void
-=======
 EINA_DEPRECATED EAPI void
->>>>>>> remotes/origin/upstream
 elm_panes_content_right_set(Evas_Object *obj, Evas_Object *content)
 {
    _content_set_hook(obj, "right", content);
 }
 
-<<<<<<< HEAD
-EAPI Evas_Object *
-=======
 EINA_DEPRECATED EAPI Evas_Object *
->>>>>>> remotes/origin/upstream
 elm_panes_content_left_get(const Evas_Object *obj)
 {
    return _content_get_hook(obj, "left");
 }
 
-<<<<<<< HEAD
-EAPI Evas_Object *
-=======
 EINA_DEPRECATED EAPI Evas_Object *
->>>>>>> remotes/origin/upstream
 elm_panes_content_right_get(const Evas_Object *obj)
 {
    return _content_get_hook(obj, "right");
 }
 
-<<<<<<< HEAD
-EAPI Evas_Object *
-=======
 EINA_DEPRECATED EAPI Evas_Object *
->>>>>>> remotes/origin/upstream
 elm_panes_content_left_unset(Evas_Object *obj)
 {
    return _content_unset_hook(obj, "left");
 }
 
-<<<<<<< HEAD
-EAPI Evas_Object *
-=======
 EINA_DEPRECATED EAPI Evas_Object *
->>>>>>> remotes/origin/upstream
 elm_panes_content_right_unset(Evas_Object *obj)
 {
    return _content_unset_hook(obj, "right");
@@ -491,8 +429,6 @@ elm_panes_content_left_size_set(Evas_Object *obj, double size)
      edje_object_part_drag_value_set(wd->panes, "elm.bar", size, 0.0);
 }
 
-<<<<<<< HEAD
-=======
 EAPI double
 elm_panes_content_right_size_get(const Evas_Object *obj)
 {
@@ -505,7 +441,6 @@ elm_panes_content_right_size_set(Evas_Object *obj, double size)
    elm_panes_content_left_size_set(obj, (1.0 - size));
 }
 
->>>>>>> remotes/origin/upstream
 EAPI void
 elm_panes_horizontal_set(Evas_Object *obj, Eina_Bool horizontal)
 {