[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 f80fe85..6e817fc 100644 (file)
--- a/src/lib/elm_panes.c
+++ b/src/lib/elm_panes.c
@@ -89,6 +89,8 @@ _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);
+   if (wd->contents.left && wd->contents.right)
+     edje_object_signal_emit(wd->panes, "elm.panes.pair", "elm");
    if (wd->fixed)
      edje_object_signal_emit(wd->panes, "elm.panes.fixed", "elm");
 
@@ -166,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);
      }
@@ -173,12 +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);
      }
 }
 
-
 static void
 _clicked(void *data, Evas_Object *obj __UNUSED__ , const char *emission __UNUSED__, const char *source __UNUSED__)
 {
@@ -212,6 +215,109 @@ _unpress(void *data, Evas_Object *obj __UNUSED__ , const char *emission __UNUSED
      }
 }
 
+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);
+        edje_object_signal_emit(wd->panes, "elm.panes.unpair", "elm");
+     }
+   wd->contents.left = content;
+   if (content)
+     {
+        elm_widget_sub_object_add(obj, content);
+        edje_object_part_swallow(wd->panes, "elm.swallow.left", content);
+        if (wd->contents.right)
+          edje_object_signal_emit(wd->panes, "elm.panes.pair", "elm");
+     }
+}
+
+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);
+        edje_object_signal_emit(wd->panes, "elm.panes.unpair", "elm");
+     }
+   wd->contents.right = content;
+   if (content)
+     {
+        elm_widget_sub_object_add(obj, content);
+        edje_object_part_swallow(wd->panes, "elm.swallow.right", content);
+        if (wd->contents.left)
+          edje_object_signal_emit(wd->panes, "elm.panes.pair", "elm");
+     }
+}
+
+static Evas_Object *
+_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;
+   elm_widget_sub_object_del(obj, content);
+   edje_object_signal_emit(wd->panes, "elm.panes.unpair", "elm");
+   return content;
+}
+
+static Evas_Object *
+_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;
+   elm_widget_sub_object_del(obj, content);
+   edje_object_signal_emit(wd->panes, "elm.panes.unpair", "elm");
+   return content;
+}
+
+static void
+_content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   if (part && (!strncmp(part, "elm.swallow.", 12))) part += 12;
+   if (!part || !strcmp(part, "left"))
+     _content_left_set(obj, content);
+   else if (!strcmp(part, "right"))
+     _content_right_set(obj, content);
+}
+
+static Evas_Object *
+_content_get_hook(const Evas_Object *obj, const char *part)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return NULL;
+   if (part && (!strncmp(part, "elm.swallow.", 12))) part += 12;
+   if (!part || !strcmp(part, "left"))
+     return wd->contents.left;
+   else if (!strcmp(part, "right"))
+     return wd->contents.right;
+   return NULL;
+}
+
+static Evas_Object *
+_content_unset_hook(Evas_Object *obj, const char *part)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return NULL;
+   if (part && (!strncmp(part, "elm.swallow.", 12))) part += 12;
+   if (!part || !strcmp(part, "left"))
+     return _content_left_unset(obj);
+   else if (!strcmp(part, "right"))
+     return _content_right_unset(obj);
+   return NULL;
+}
+
 EAPI Evas_Object *
 elm_panes_add(Evas_Object *parent)
 {
@@ -228,6 +334,9 @@ elm_panes_add(Evas_Object *parent)
    elm_widget_del_hook_set(obj, _del_hook);
    elm_widget_theme_hook_set(obj, _theme_hook);
    elm_widget_focus_next_hook_set(obj, _elm_panes_focus_next_hook);
+   elm_widget_content_set_hook_set(obj, _content_set_hook);
+   elm_widget_content_get_hook_set(obj, _content_get_hook);
+   elm_widget_content_unset_hook_set(obj, _content_unset_hook);
    elm_widget_can_focus_set(obj, EINA_FALSE);
 
    wd->panes = edje_object_add(e);
@@ -257,88 +366,40 @@ elm_panes_add(Evas_Object *parent)
    return obj;
 }
 
-
-EAPI void
+EINA_DEPRECATED EAPI void
 elm_panes_content_left_set(Evas_Object *obj, Evas_Object *content)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-   if (wd->contents.left)
-     {
-        evas_object_del(wd->contents.left);
-        wd->contents.left = NULL;
-     }
-   if (content)
-     {
-        wd->contents.left = content;
-        elm_widget_sub_object_add(obj, content);
-        edje_object_part_swallow(wd->panes, "elm.swallow.left", content);
-     }
+   _content_set_hook(obj, "left", content);
 }
 
-EAPI void
+EINA_DEPRECATED EAPI void
 elm_panes_content_right_set(Evas_Object *obj, Evas_Object *content)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-   if (wd->contents.right)
-     {
-        evas_object_del(wd->contents.right);
-        wd->contents.right = NULL;
-     }
-   if (content)
-     {
-        wd->contents.right = content;
-        elm_widget_sub_object_add(obj, content);
-        edje_object_part_swallow(wd->panes, "elm.swallow.right", content);
-     }
+   _content_set_hook(obj, "right", content);
 }
 
-EAPI Evas_Object *
+EINA_DEPRECATED EAPI Evas_Object *
 elm_panes_content_left_get(const Evas_Object *obj)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return NULL;
-   return wd->contents.left;
+   return _content_get_hook(obj, "left");
 }
 
-EAPI Evas_Object *
+EINA_DEPRECATED EAPI Evas_Object *
 elm_panes_content_right_get(const Evas_Object *obj)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   return wd->contents.right;
+   return _content_get_hook(obj, "right");
 }
 
-EAPI Evas_Object *
+EINA_DEPRECATED EAPI Evas_Object *
 elm_panes_content_left_unset(Evas_Object *obj)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return NULL;
-   if (!wd->contents.left) return NULL;
-   Evas_Object *content = wd->contents.left;
-   elm_widget_sub_object_del(obj, content);
-   edje_object_part_unswallow(wd->panes, content);
-   wd->contents.left = NULL;
-   return content;
+   return _content_unset_hook(obj, "left");
 }
 
-EAPI Evas_Object *
+EINA_DEPRECATED EAPI Evas_Object *
 elm_panes_content_right_unset(Evas_Object *obj)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return NULL;
-   if (!wd->contents.right) return NULL;
-   Evas_Object *content = wd->contents.right;
-   elm_widget_sub_object_del(obj, content);
-   edje_object_part_unswallow(wd->panes, content);
-   wd->contents.right = NULL;
-   return content;
+   return _content_unset_hook(obj, "right");
 }
 
 EAPI double
@@ -368,6 +429,18 @@ elm_panes_content_left_size_set(Evas_Object *obj, double size)
      edje_object_part_drag_value_set(wd->panes, "elm.bar", size, 0.0);
 }
 
+EAPI double
+elm_panes_content_right_size_get(const Evas_Object *obj)
+{
+   return (1.0 - elm_panes_content_left_size_get(obj));
+}
+
+EAPI void
+elm_panes_content_right_size_set(Evas_Object *obj, double size)
+{
+   elm_panes_content_left_size_set(obj, (1.0 - size));
+}
+
 EAPI void
 elm_panes_horizontal_set(Evas_Object *obj, Eina_Bool horizontal)
 {