Merge "elementary/toolbar : can_focus should be set as EINA_TRUE."

diff --git a/packaging/elementary.spec b/packaging/elementary.spec
index 3fa26f5..76ab445 100644 (file)
--- a/packaging/elementary.spec
+++ b/packaging/elementary.spec
@@ -3,8 +3,8 @@ Name:       elementary
 Summary:    EFL toolkit for small touchscreens
 Version:    1.0.0+svn.69448slp2+build05
 Release:    1
-Group:      TO_BE/FILLED_IN
-License:    TO_BE/FILLED_IN
+Group:      System/Libraries
+License:    LGPLv2.1
 URL:        http://trac.enlightenment.org/e/wiki/Elementary
 Source0:    %{name}-%{version}.tar.gz
 Requires(post): /sbin/ldconfig

diff --git a/src/lib/elm_panes.c b/src/lib/elm_panes.c
index 74d868c..cd73f97 100644 (file)
--- a/src/lib/elm_panes.c
+++ b/src/lib/elm_panes.c
@@ -168,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);
      }
@@ -175,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__)
 {
@@ -218,15 +219,15 @@ 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;
         edje_object_signal_emit(wd->panes, "elm.panes.unpair", "elm");
      }
+   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);
         if (wd->contents.right)
@@ -238,15 +239,15 @@ 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;
         edje_object_signal_emit(wd->panes, "elm.panes.unpair", "elm");
      }
+   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);
         if (wd->contents.left)
@@ -260,11 +261,7 @@ _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;
-
-   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");
    return content;
 }
@@ -275,11 +272,7 @@ _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;
-
-   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");
    return content;
 }