Merge "[C&P popup] add search button & change clipboard icon to text Change-Id: Iccaa...

diff --git a/debian/changelog b/debian/changelog
index efc630a..5d478ef 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+elementary (1.0.0+svn.61256slp2+build116) unstable; urgency=low
+
+  * Package Upload
+  * Git: slp/pkgs/e/elementary
+  * Tag: elementary_1.0.0+svn.61256slp2+build116
+
+ -- ChunEon Park <chuneon.park@samsung.com>  Mon, 16 Jan 2012 14:51:07 +0900
+
 elementary (1.0.0+svn.61256slp2+build115) unstable; urgency=low
 
   * Package Upload

diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index bb57b61..c134cf6 100644 (file)
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -19,6 +19,7 @@ struct _Elm_Naviframe_Content_Item_Pair
 {
    EINA_INLIST;
    const char *part;
+   Evas_Object *content;
    Elm_Naviframe_Item *it;
 };
 
@@ -26,6 +27,7 @@ struct _Elm_Naviframe_Text_Item_Pair
 {
    EINA_INLIST;
    const char *part;
+   const char *text;
 };
 
 struct _Elm_Naviframe_Item
@@ -64,6 +66,7 @@ static void _emit_hook(Evas_Object *obj,
                        const char *emission,
                        const char *source);
 static void _disable_hook(Evas_Object *obj);
+static void _mirrored_set(Evas_Object *obj, Eina_Bool rtl);
 static void _item_text_set_hook(Elm_Object_Item *it,
                                 const char *part,
                                 const char *label);
@@ -154,9 +157,6 @@ static Elm_Naviframe_Item * _item_new(Evas_Object *obj,
                                       Evas_Object *next_btn,
                                       Evas_Object *content,
                                       const char *item_style);
-static Eina_Bool _focus_next_hook(const Evas_Object *obj,
-                                  Elm_Focus_Direction dir,
-                                  Evas_Object **next);
 
 static void
 _del_hook(Evas_Object *obj)
@@ -201,6 +201,9 @@ _theme_hook(Evas_Object *obj)
         _item_style_set(it, it->style);
         _item_title_visible_update(it);
      }
+
+   _elm_widget_mirrored_reload(obj);
+   _mirrored_set(obj, elm_widget_mirrored_get(obj));
 }
 
 static void _emit_hook(Evas_Object *obj,
@@ -212,7 +215,7 @@ static void _emit_hook(Evas_Object *obj,
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
 
-   elm_object_signal_emit(wd->base, emission, source);
+   edje_object_signal_emit(wd->base, emission, source);
 }
 
 static void
@@ -222,6 +225,20 @@ _disable_hook(Evas_Object *obj __UNUSED__)
 }
 
 static void
+_mirrored_set(Evas_Object *obj, Eina_Bool rtl)
+{
+   Widget_Data *wd;
+   Elm_Naviframe_Item *it;
+
+   wd  = elm_widget_data_get(obj);
+   if (!wd) return;
+
+   EINA_INLIST_FOREACH(wd->stack, it)
+     edje_object_mirrored_set(VIEW(it), rtl);
+   edje_object_mirrored_set(wd->base, rtl);
+}
+
+static void
 _item_text_set_hook(Elm_Object_Item *it,
                     const char *part,
                     const char *label)
@@ -255,17 +272,19 @@ _item_text_set_hook(Elm_Object_Item *it,
         navi_it->text_list = eina_inlist_append(navi_it->text_list,
                                                 EINA_INLIST_GET(pair));
      }
-   elm_object_part_text_set(VIEW(navi_it), buf, label);
+
+   eina_stringshare_replace(&pair->text, label);
+   edje_object_part_text_set(VIEW(navi_it), buf, label);
 
    if (label)
      {
         snprintf(buf, sizeof(buf), "elm,state,%s,show", buf);
-        elm_object_signal_emit(VIEW(navi_it), buf, "elm");
+        edje_object_signal_emit(VIEW(navi_it), buf, "elm");
      }
    else
      {
         snprintf(buf, sizeof(buf), "elm,state,%s,hide", buf);
-        elm_object_signal_emit(VIEW(navi_it), buf, "elm");
+        edje_object_signal_emit(VIEW(navi_it), buf, "elm");
      }
 
    _sizing_eval(WIDGET(navi_it));
@@ -275,6 +294,8 @@ static const char *
 _item_text_get_hook(const Elm_Object_Item *it, const char *part)
 {
    ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
+   Elm_Naviframe_Text_Item_Pair *pair = NULL;
+   Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
    char buf[1024];
 
    if (!part || !strcmp(part, "default"))
@@ -284,7 +305,12 @@ _item_text_get_hook(const Elm_Object_Item *it, const char *part)
    else
      snprintf(buf, sizeof(buf), "%s", part);
 
-   return elm_object_part_text_get(VIEW(it), buf);
+   EINA_INLIST_FOREACH(navi_it->text_list, pair)
+     {
+        if (!strcmp(buf, pair->part))
+          return pair->text;
+     }
+   return NULL;
 }
 
 static void
@@ -326,6 +352,7 @@ static Evas_Object *
 _item_content_get_hook(const Elm_Object_Item *it, const char *part)
 {
    ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
+   Elm_Naviframe_Content_Item_Pair *pair = NULL;
    Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
 
    //specified parts
@@ -339,7 +366,12 @@ _item_content_get_hook(const Elm_Object_Item *it, const char *part)
      return navi_it->title_icon;
 
    //common parts
-   return elm_object_part_content_get(VIEW(navi_it), part);
+   EINA_INLIST_FOREACH(navi_it->content_list, pair)
+     {
+        if (!strcmp(part, pair->part))
+          return pair->content;
+     }
+   return NULL;
 }
 
 static Evas_Object *
@@ -367,16 +399,17 @@ _item_signal_emit_hook(Elm_Object_Item *it,
                        const char *source)
 {
    ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
-   elm_object_signal_emit(VIEW(it), emission, source);
+   Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
+   edje_object_signal_emit(VIEW(navi_it), emission, source);
 }
 
 static void
 _item_title_visible_update(Elm_Naviframe_Item *navi_it)
 {
    if (navi_it->title_visible)
-     elm_object_signal_emit(VIEW(navi_it), "elm,state,title,show", "elm");
+     edje_object_signal_emit(VIEW(navi_it), "elm,state,title,show", "elm");
    else
-     elm_object_signal_emit(VIEW(navi_it), "elm,state,title,hide", "elm");
+     edje_object_signal_emit(VIEW(navi_it), "elm,state,title,hide", "elm");
 }
 
 static void
@@ -396,9 +429,7 @@ _sizing_eval(Evas_Object *obj)
      {
         evas_object_move(VIEW(it), x, y);
         evas_object_resize(VIEW(it), w, h);
-        edje_object_size_min_calc(elm_layout_edje_get(VIEW(it)),
-                                  &it->minw,
-                                  &it->minh);
+        edje_object_size_min_calc(VIEW(it), &it->minw, &it->minh);
         if (it->minw > minw) minw = it->minw;
         if (it->minh > minh) minh = it->minh;
      }
@@ -469,7 +500,7 @@ _title_content_del(void *data,
    Elm_Naviframe_Content_Item_Pair *pair = data;
    Elm_Naviframe_Item *it = pair->it;
    snprintf(buf, sizeof(buf), "elm,state,%s,hide", pair->part);
-   elm_object_signal_emit(VIEW(it), buf, "elm");
+   edje_object_signal_emit(VIEW(it), buf, "elm");
    it->content_list = eina_inlist_remove(it->content_list,
                                          EINA_INLIST_GET(pair));
    eina_stringshare_del(pair->part);
@@ -485,7 +516,7 @@ _title_prev_btn_del(void *data,
    Elm_Naviframe_Item *it = data;
    it->back_btn = EINA_FALSE;
    it->title_prev_btn = NULL;
-   elm_object_signal_emit(VIEW(it), "elm,state,prev_btn,hide", "elm");
+   edje_object_signal_emit(VIEW(it), "elm,state,prev_btn,hide", "elm");
 }
 
 static void
@@ -496,7 +527,7 @@ _title_next_btn_del(void *data,
 {
    Elm_Naviframe_Item *it = data;
    it->title_next_btn = NULL;
-   elm_object_signal_emit(VIEW(it), "elm,state,next_btn,hide", "elm");
+   edje_object_signal_emit(VIEW(it), "elm,state,next_btn,hide", "elm");
 }
 
 static void
@@ -507,7 +538,7 @@ _title_icon_del(void *data,
 {
    Elm_Naviframe_Item *it = data;
    it->title_icon = NULL;
-   elm_object_signal_emit(VIEW(it), "elm,state,icon,hide", "elm");
+   edje_object_signal_emit(VIEW(it), "elm,state,icon,hide", "elm");
 }
 
 static void
@@ -518,7 +549,7 @@ _item_content_del(void *data,
 {
    Elm_Naviframe_Item *it = data;
    it->content = NULL;
-   elm_object_signal_emit(VIEW(it), "elm,state,content,hide", "elm");
+   edje_object_signal_emit(VIEW(it), "elm,state,content,hide", "elm");
 }
 
 static void
@@ -528,25 +559,26 @@ _title_content_set(Elm_Naviframe_Item *it,
 {
    char buf[1024];
    Elm_Naviframe_Content_Item_Pair *pair = NULL;
-   Evas_Object *prev_content = NULL;
 
    EINA_INLIST_FOREACH(it->content_list, pair)
      if (!strcmp(part, pair->part)) break;
 
    if (pair)
      {
-        prev_content = elm_object_part_content_get(VIEW(it), part);
-        if (prev_content != content)
+        if (pair->content != content)
           {
              if (content)
                {
-                  evas_object_event_callback_del(prev_content,
+                  evas_object_event_callback_del(pair->content,
                                                  EVAS_CALLBACK_DEL,
                                                  _title_content_del);
+                  evas_object_event_callback_del(pair->content,
+                                                 EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                                 _changed_size_hints);
                   snprintf(buf, sizeof(buf), "elm,state,%s,hide", part);
-                  elm_object_signal_emit(VIEW(it), buf, "elm");
+                  edje_object_signal_emit(VIEW(it), buf, "elm");
                }
-             evas_object_del(prev_content);
+             evas_object_del(pair->content);
              if (!content) return;
           }
      }
@@ -564,16 +596,22 @@ _title_content_set(Elm_Naviframe_Item *it,
         it->content_list = eina_inlist_append(it->content_list,
                                               EINA_INLIST_GET(pair));
      }
-   if (prev_content != content)
+   if (pair->content != content)
      {
+        elm_widget_sub_object_add(WIDGET(it), content);
         evas_object_event_callback_add(content,
                                        EVAS_CALLBACK_DEL,
                                        _title_content_del,
                                        pair);
+        evas_object_event_callback_add(content,
+                                       EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                       _changed_size_hints,
+                                       WIDGET(it));
      }
-   elm_object_part_content_set(VIEW(it), part, content);
+   edje_object_part_swallow(VIEW(it), part, content);
    snprintf(buf, sizeof(buf), "elm,state,%s,show", part);
-   elm_object_signal_emit(VIEW(it), buf, "elm");
+   edje_object_signal_emit(VIEW(it), buf, "elm");
+   pair->content = content;
 
    _sizing_eval(WIDGET(it));
 }
@@ -584,16 +622,24 @@ _title_prev_btn_set(Elm_Naviframe_Item *it,
                     Eina_Bool back_btn)
 {
    if (it->title_prev_btn == btn) return;
-   if (it->title_prev_btn) evas_object_del(it->title_prev_btn);
+
+   if (it->title_prev_btn)
+     evas_object_del(it->title_prev_btn);
+
    it->title_prev_btn = btn;
    if (!btn) return;
 
+   elm_widget_sub_object_add(WIDGET(it), btn);
    evas_object_event_callback_add(btn,
                                   EVAS_CALLBACK_DEL,
                                   _title_prev_btn_del,
                                   it);
-   elm_object_part_content_set(VIEW(it), "elm.swallow.prev_btn", btn);
-   elm_object_signal_emit(VIEW(it), "elm,state,prev_btn,show", "elm");
+   evas_object_event_callback_add(btn,
+                                  EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                  _changed_size_hints,
+                                  WIDGET(it));
+   edje_object_part_swallow(VIEW(it), "elm.swallow.prev_btn", btn);
+   edje_object_signal_emit(VIEW(it), "elm,state,prev_btn,show", "elm");
    it->back_btn = back_btn;
 
    _sizing_eval(WIDGET(it));
@@ -603,16 +649,24 @@ static void
 _title_next_btn_set(Elm_Naviframe_Item *it, Evas_Object *btn)
 {
    if (it->title_next_btn == btn) return;
-   if (it->title_next_btn) evas_object_del(it->title_next_btn);
+
+   if (it->title_next_btn)
+     evas_object_del(it->title_next_btn);
+
    it->title_next_btn = btn;
    if (!btn) return;
 
+   elm_widget_sub_object_add(WIDGET(it), btn);
    evas_object_event_callback_add(btn,
                                   EVAS_CALLBACK_DEL,
                                   _title_next_btn_del,
                                   it);
-   elm_object_part_content_set(VIEW(it), "elm.swallow.next_btn", btn);
-   elm_object_signal_emit(VIEW(it), "elm,state,next_btn,show", "elm");
+   evas_object_event_callback_add(btn,
+                                  EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                  _changed_size_hints,
+                                  WIDGET(it));
+   edje_object_part_swallow(VIEW(it), "elm.swallow.next_btn", btn);
+   edje_object_signal_emit(VIEW(it), "elm,state,next_btn,show", "elm");
 
    _sizing_eval(WIDGET(it));
 }
@@ -621,16 +675,24 @@ static void
 _title_icon_set(Elm_Naviframe_Item *it, Evas_Object *icon)
 {
    if (it->title_icon == icon) return;
-   if (it->title_icon) evas_object_del(it->title_icon);
+
+   if (it->title_icon)
+     evas_object_del(it->title_icon);
+
    it->title_icon = icon;
    if (!icon) return;
 
+   elm_widget_sub_object_add(WIDGET(it), icon);
    evas_object_event_callback_add(icon,
                                   EVAS_CALLBACK_DEL,
                                   _title_icon_del,
                                   it);
-   elm_object_part_content_set(VIEW(it), "elm.swallow.icon", icon);
-   elm_object_signal_emit(VIEW(it), "elm,state,icon,show", "elm");
+   evas_object_event_callback_add(icon,
+                                  EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                  _changed_size_hints,
+                                  WIDGET(it));
+   edje_object_part_swallow(VIEW(it), "elm.swallow.icon", icon);
+   edje_object_signal_emit(VIEW(it), "elm,state,icon,show", "elm");
 
    _sizing_eval(WIDGET(it));
 }
@@ -641,11 +703,15 @@ _item_content_unset(Elm_Naviframe_Item *it)
    Evas_Object *content = it->content;
    if (!content) return NULL;
 
-   elm_object_part_content_unset(VIEW(it), "elm.swallow.content");
-   elm_object_signal_emit(VIEW(it), "elm,state,content,hide", "elm");
+   elm_widget_sub_object_del(WIDGET(it), content);
+   edje_object_part_unswallow(VIEW(it), content);
+   edje_object_signal_emit(VIEW(it), "elm,state,content,hide", "elm");
    evas_object_event_callback_del(content,
                                   EVAS_CALLBACK_DEL,
                                   _item_content_del);
+   evas_object_event_callback_del(content,
+                                  EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                  _changed_size_hints);
    _sizing_eval(WIDGET(it));
 
    it->content = NULL;
@@ -658,11 +724,15 @@ _title_prev_btn_unset(Elm_Naviframe_Item *it)
    Evas_Object *content = it->title_prev_btn;
    if (!content) return NULL;
 
-   elm_object_part_content_unset(VIEW(it), "elm.swallow.prev_btn");
-   elm_object_signal_emit(VIEW(it), "elm,state,prev_btn,hide", "elm");
+   elm_widget_sub_object_del(WIDGET(it), content);
+   edje_object_part_unswallow(VIEW(it), content);
+   edje_object_signal_emit(VIEW(it), "elm,state,prev_btn,hide", "elm");
    evas_object_event_callback_del(content,
                                   EVAS_CALLBACK_DEL,
                                   _title_prev_btn_del);
+   evas_object_event_callback_del(content,
+                                  EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                  _changed_size_hints);
    _sizing_eval(WIDGET(it));
 
    it->title_prev_btn = NULL;
@@ -675,11 +745,15 @@ _title_next_btn_unset(Elm_Naviframe_Item *it)
    Evas_Object *content = it->title_next_btn;
    if (!content) return NULL;
 
-   elm_object_part_content_unset(VIEW(it), "elm.swallow.next_btn");
-   elm_object_signal_emit(VIEW(it), "elm,state,next_btn,hide", "elm");
+   elm_widget_sub_object_del(WIDGET(it), content);
+   edje_object_part_unswallow(VIEW(it), content);
+   edje_object_signal_emit(VIEW(it), "elm,state,next_btn,hide", "elm");
    evas_object_event_callback_del(content,
                                   EVAS_CALLBACK_DEL,
                                   _title_next_btn_del);
+   evas_object_event_callback_del(content,
+                                  EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                  _changed_size_hints);
    _sizing_eval(WIDGET(it));
 
    it->title_next_btn = NULL;
@@ -692,11 +766,15 @@ _title_icon_unset(Elm_Naviframe_Item *it)
    Evas_Object *content = it->title_icon;
    if (!content) return NULL;
 
-   elm_object_part_content_unset(VIEW(it), "elm.swallow.icon");
-   elm_object_signal_emit(VIEW(it), "elm,state,icon,hide", "elm");
+   elm_widget_sub_object_del(WIDGET(it), content);
+   edje_object_part_unswallow(VIEW(it), content);
+   edje_object_signal_emit(VIEW(it), "elm,state,icon,hide", "elm");
    evas_object_event_callback_del(content,
                                   EVAS_CALLBACK_DEL,
                                   _title_icon_del);
+   evas_object_event_callback_del(content,
+                                  EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                  _changed_size_hints);
    _sizing_eval(WIDGET(it));
    it->title_icon = NULL;
 
@@ -714,7 +792,7 @@ _title_content_unset(Elm_Naviframe_Item *it, const char *part)
      {
         if (!strcmp(part, pair->part))
           {
-             content = elm_object_part_content_get(VIEW(it), part);
+             content = pair->content;
              eina_stringshare_del(pair->part);
              it->content_list = eina_inlist_remove(it->content_list,
                                                    EINA_INLIST_GET(pair));
@@ -725,12 +803,16 @@ _title_content_unset(Elm_Naviframe_Item *it, const char *part)
 
    if (!content) return NULL;
 
-   elm_object_part_content_unset(VIEW(it), part);
+   elm_widget_sub_object_del(WIDGET(it), content);
+   edje_object_part_unswallow(VIEW(it), content);
    snprintf(buf, sizeof(buf), "elm,state,%s,hide", part);
-   elm_object_signal_emit(VIEW(it), buf, "elm");
+   edje_object_signal_emit(VIEW(it), buf, "elm");
    evas_object_event_callback_del(content,
                                   EVAS_CALLBACK_DEL,
                                   _title_content_del);
+   evas_object_event_callback_del(content,
+                                  EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                  _changed_size_hints);
    _sizing_eval(WIDGET(it));
 
    return content;
@@ -742,22 +824,32 @@ _item_del(Elm_Naviframe_Item *it)
    Widget_Data *wd;
    Elm_Naviframe_Content_Item_Pair *content_pair;
    Elm_Naviframe_Text_Item_Pair *text_pair;
-   Evas_Object *content;
 
    if (!it) return;
 
    wd = elm_widget_data_get(WIDGET(it));
    if (!wd) return;
 
+   if (it->title_prev_btn)
+     evas_object_del(it->title_prev_btn);
+   if (it->title_next_btn)
+     evas_object_del(it->title_next_btn);
+   if (it->title_icon)
+     evas_object_del(it->title_icon);
+   if ((it->content) && (!wd->preserve))
+     evas_object_del(it->content);
+
    while (it->content_list)
      {
-        content_pair =
-           EINA_INLIST_CONTAINER_GET(it->content_list,
-                                     Elm_Naviframe_Content_Item_Pair);
-        content = elm_object_part_content_get(VIEW(it), content_pair->part);
-        evas_object_event_callback_del(content,
+        content_pair = EINA_INLIST_CONTAINER_GET(it->content_list,
+                                                 Elm_Naviframe_Content_Item_Pair);
+        evas_object_event_callback_del(content_pair->content,
                                        EVAS_CALLBACK_DEL,
                                        _title_content_del);
+        evas_object_event_callback_del(content_pair->content,
+                                       EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                       _changed_size_hints);
+        evas_object_del(content_pair->content);
         eina_stringshare_del(content_pair->part);
         it->content_list = eina_inlist_remove(it->content_list,
                                               it->content_list);
@@ -769,6 +861,7 @@ _item_del(Elm_Naviframe_Item *it)
         text_pair = EINA_INLIST_CONTAINER_GET(it->text_list,
                                               Elm_Naviframe_Text_Item_Pair);
         eina_stringshare_del(text_pair->part);
+        eina_stringshare_del(text_pair->text);
         it->text_list = eina_inlist_remove(it->text_list,
                                            it->text_list);
         free(text_pair);
@@ -849,17 +942,26 @@ _item_content_set(Elm_Naviframe_Item *navi_it, Evas_Object *content)
 {
    if (navi_it->content == content) return;
    if (navi_it->content) evas_object_del(navi_it->content);
-   elm_object_part_content_set(VIEW(navi_it), "elm.swallow.content", content);
-
+   elm_widget_sub_object_add(WIDGET(navi_it), content);
+   edje_object_part_swallow(VIEW(navi_it),
+                            "elm.swallow.content",
+                            content);
    if (content)
-     elm_object_signal_emit(VIEW(navi_it), "elm,state,content,show", "elm");
+     edje_object_signal_emit(VIEW(navi_it),
+                             "elm,state,content,show",
+                             "elm");
    else
-     elm_object_signal_emit(VIEW(navi_it), "elm,state,content,hide", "elm");
-
+     edje_object_signal_emit(VIEW(navi_it),
+                             "elm,state,content,hide",
+                             "elm");
    evas_object_event_callback_add(content,
                                   EVAS_CALLBACK_DEL,
                                   _item_content_del,
                                   navi_it);
+   evas_object_event_callback_add(content,
+                                  EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                  _changed_size_hints,
+                                  WIDGET(navi_it));
    navi_it->content = content;
    _sizing_eval(WIDGET(navi_it));
 }
@@ -884,33 +986,53 @@ _item_style_set(Elm_Naviframe_Item *navi_it, const char *item_style)
         snprintf(buf, sizeof(buf), "item/%s", item_style);
         eina_stringshare_replace(&navi_it->style, item_style);
      }
-   elm_layout_theme_set(VIEW(navi_it),
-                        "naviframe",
-                        buf,
-                        elm_widget_style_get(WIDGET(navi_it)));
+   _elm_theme_object_set(WIDGET(navi_it),
+                         VIEW(navi_it),
+                         "naviframe",
+                         buf,
+                         elm_widget_style_get(WIDGET(navi_it)));
    //recover item
    EINA_INLIST_FOREACH(navi_it->text_list, text_pair)
-     _item_text_set_hook((Elm_Object_Item *) navi_it,
-                         text_pair->part,
-                         elm_object_part_text_get(VIEW(navi_it),
-                                                  text_pair->part));
+      _item_text_set_hook((Elm_Object_Item *) navi_it,
+                          text_pair->part,
+                          text_pair->text);
 
    EINA_INLIST_FOREACH(navi_it->content_list, content_pair)
-     _item_content_set_hook((Elm_Object_Item *) navi_it,
-                            content_pair->part,
-                            elm_object_part_content_get(VIEW(navi_it),
-                                                        content_pair->part));
+      _item_content_set_hook((Elm_Object_Item *) navi_it,
+                             content_pair->part,
+                             content_pair->content);
    //content
    if (navi_it->content)
-     elm_object_signal_emit(VIEW(navi_it), "elm,state,content,show", "elm");
+     {
+        edje_object_part_swallow(VIEW(navi_it),
+                                 "elm.swallow.content",
+                                 navi_it->content);
+        edje_object_signal_emit(VIEW(navi_it),
+                                "elm,state,content,show",
+                                "elm");
+     }
 
    //prev button
    if (navi_it->title_prev_btn)
-     elm_object_signal_emit(VIEW(navi_it), "elm,state,prev_btn,show", "elm");
+     {
+        edje_object_part_swallow(VIEW(navi_it),
+                                 "elm.swallow.prev_btn",
+                                 navi_it->title_prev_btn);
+        edje_object_signal_emit(VIEW(navi_it),
+                                "elm,state,prev_btn,show",
+                                "elm");
+     }
 
    //next button
    if (navi_it->title_next_btn)
-     elm_object_signal_emit(VIEW(navi_it), "elm,state,next_btn,show", "elm");
+     {
+        edje_object_part_swallow(VIEW(navi_it),
+                                 "elm.swallow.next_btn",
+                                 navi_it->title_next_btn);
+        edje_object_signal_emit(VIEW(navi_it),
+                                "elm,state,next_btn,show",
+                                "elm");
+     }
 
    navi_it->title_visible = EINA_TRUE;
    _sizing_eval(WIDGET(navi_it));
@@ -948,26 +1070,23 @@ _item_new(Evas_Object *obj,
    elm_widget_item_signal_emit_hook_set(it, _item_signal_emit_hook);
 
    //item base layout
-   VIEW(it) = elm_layout_add(obj);
+   VIEW(it) = edje_object_add(evas_object_evas_get(obj));
+   edje_object_mirrored_set(VIEW(it), elm_widget_mirrored_get(obj));
    evas_object_smart_member_add(VIEW(it), wd->base);
-
-   evas_object_event_callback_add(VIEW(it),
-                                  EVAS_CALLBACK_CHANGED_SIZE_HINTS,
-                                  _changed_size_hints,
-                                  obj);
-   elm_object_signal_callback_add(VIEW(it),
+   elm_widget_sub_object_add(obj, VIEW(it));
+   edje_object_signal_callback_add(VIEW(it),
                                    "elm,action,show,finished",
                                    "",
                                    _show_finished, it);
-   elm_object_signal_callback_add(VIEW(it),
+   edje_object_signal_callback_add(VIEW(it),
                                    "elm,action,pushed,finished",
                                    "",
                                    _pushed_finished, it);
-   elm_object_signal_callback_add(VIEW(it),
+   edje_object_signal_callback_add(VIEW(it),
                                    "elm,action,popped,finished",
                                    "",
                                    _popped_finished, it);
-   elm_object_signal_callback_add(VIEW(it),
+   edje_object_signal_callback_add(VIEW(it),
                                    "elm,action,title,clicked",
                                    "",
                                    _title_clicked, it);
@@ -990,16 +1109,6 @@ _item_new(Evas_Object *obj,
    return it;
 }
 
-static Eina_Bool
-_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
-{
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd || !wd->stack) return EINA_FALSE;
-   return elm_widget_focus_next_get(VIEW(elm_naviframe_top_item_get(obj)),
-                                    dir,
-                                    next);
-}
-
 EAPI Evas_Object *
 elm_naviframe_add(Evas_Object *parent)
 {
@@ -1016,17 +1125,12 @@ elm_naviframe_add(Evas_Object *parent)
    elm_widget_disable_hook_set(obj, _disable_hook);
    elm_widget_theme_hook_set(obj, _theme_hook);
    elm_widget_signal_emit_hook_set(obj, _emit_hook);
-   elm_widget_can_focus_set(obj, EINA_FALSE);
-   elm_widget_focus_next_hook_set(obj, _focus_next_hook);
 
    //base
-   wd->base = elm_layout_add(parent);
-   evas_object_event_callback_add(wd->base,
-                                  EVAS_CALLBACK_CHANGED_SIZE_HINTS,
-                                  _changed_size_hints,
-                                  obj);
+   wd->base = edje_object_add(e);
+   edje_object_mirrored_set(wd->base, elm_widget_mirrored_get(obj));
    elm_widget_resize_object_set(obj, wd->base);
-   elm_layout_theme_set(wd->base, "naviframe", "base", "default");
+   _elm_theme_object_set(obj, wd->base, "naviframe", "base", "default");
 
    evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE, _move, obj);
    evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _resize, obj);
@@ -1066,10 +1170,14 @@ elm_naviframe_item_push(Evas_Object *obj,
              evas_object_freeze_events_set(VIEW(it), EINA_TRUE);
              evas_object_freeze_events_set(VIEW(prev_it), EINA_TRUE);
           }
-        elm_object_signal_emit(VIEW(prev_it), "elm,state,cur,pushed", "elm");
-        elm_object_signal_emit(VIEW(it), "elm,state,new,pushed", "elm");
-        edje_object_message_signal_process(elm_layout_edje_get(VIEW(prev_it)));
-        edje_object_message_signal_process(elm_layout_edje_get(VIEW(it)));
+        edje_object_signal_emit(VIEW(prev_it),
+                                "elm,state,cur,pushed",
+                                "elm");
+        edje_object_signal_emit(VIEW(it),
+                                "elm,state,new,pushed",
+                                "elm");
+        edje_object_message_signal_process(VIEW(prev_it));
+        edje_object_message_signal_process(VIEW(it));
      }
    wd->stack = eina_inlist_append(wd->stack, EINA_INLIST_GET(it));
    _sizing_eval(obj);
@@ -1161,14 +1269,14 @@ elm_naviframe_item_pop(Evas_Object *obj)
              evas_object_freeze_events_set(VIEW(it), EINA_TRUE);
              evas_object_freeze_events_set(VIEW(prev_it), EINA_TRUE);
           }
-        elm_object_signal_emit(VIEW(it), "elm,state,cur,popped", "elm");
+        edje_object_signal_emit(VIEW(it), "elm,state,cur,popped", "elm");
         evas_object_show(VIEW(prev_it));
         evas_object_raise(VIEW(prev_it));
-        elm_object_signal_emit(VIEW(prev_it),
-                               "elm,state,prev,popped",
-                               "elm");
-        edje_object_message_signal_process(elm_layout_edje_get(VIEW(it)));
-        edje_object_message_signal_process(elm_layout_edje_get(VIEW(prev_it)));
+        edje_object_signal_emit(VIEW(prev_it),
+                                "elm,state,prev,popped",
+                                "elm");
+        edje_object_message_signal_process(VIEW(it));
+        edje_object_message_signal_process(VIEW(prev_it));
      }
    else
      _item_del(it);
@@ -1225,16 +1333,16 @@ elm_naviframe_item_promote(Elm_Object_Item *it)
         evas_object_freeze_events_set(VIEW(it), EINA_TRUE);
         evas_object_freeze_events_set(VIEW(prev_it), EINA_TRUE);
      }
-   elm_object_signal_emit(VIEW(prev_it),
-                          "elm,state,cur,pushed",
-                          "elm");
+   edje_object_signal_emit(VIEW(prev_it),
+                           "elm,state,cur,pushed",
+                           "elm");
    evas_object_show(VIEW(navi_it));
    evas_object_raise(VIEW(navi_it));
-   elm_object_signal_emit(VIEW(navi_it),
-                          "elm,state,new,pushed",
-                          "elm");
-   edje_object_message_signal_process(elm_layout_edje_get(VIEW(prev_it)));
-   edje_object_message_signal_process(elm_layout_edje_get(VIEW(navi_it)));
+   edje_object_signal_emit(VIEW(navi_it),
+                           "elm,state,new,pushed",
+                           "elm");
+   edje_object_message_signal_process(VIEW(prev_it));
+   edje_object_message_signal_process(VIEW(navi_it));
 }
 
 EAPI void
@@ -1258,7 +1366,7 @@ elm_naviframe_item_del(Elm_Object_Item *it)
                                             Elm_Naviframe_Item);
         evas_object_show(VIEW(navi_it));
         evas_object_raise(VIEW(navi_it));
-        elm_object_signal_emit(VIEW(navi_it), "elm,state,visible", "elm");
+        edje_object_signal_emit(VIEW(navi_it), "elm,state,visible", "elm");
      }
    else
      {

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index ec21dbc..387d33c 100644 (file)
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -2903,6 +2903,10 @@ _changed_job(void *data)
                   edje_object_size_min_restricted_calc(VIEW(it), &mw, &mh, mw, mh);
                   if (!it->display_only)
                     elm_coords_finger_size_adjust(1, &mw, 1, &mh);
+                  if (mw > itb->w)
+                    width_changed = EINA_TRUE;
+                  else
+                    mw = itb->w;
                   it->w = it->minw = mw;
                   it->h = it->minh = mh;
                   it->mincalcd = EINA_TRUE;
@@ -5288,6 +5292,29 @@ elm_genlist_item_mode_set(Elm_Genlist_Item *it,
 }
 
 EAPI const char *
+elm_genlist_mode_item_style_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->mode_item->itc->mode_item_style;
+}
+
+EAPI void
+elm_genlist_mode_item_style_set(Evas_Object *obj, const char *style)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   if ((style == wd->mode_item->itc->mode_item_style) ||
+       (style && wd->mode_item->itc->mode_item_style &&
+       (!strcmp(style, wd->mode_item->itc->mode_item_style))))
+     return;
+   eina_stringshare_replace(&wd->mode_item->itc->mode_item_style, style);
+   elm_genlist_realized_items_update(obj);
+}
+
+EAPI const char *
 elm_genlist_mode_get(const Evas_Object *obj)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;

diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index e984f93..40c04aa 100644 (file)
--- a/src/lib/elm_scroller.c
+++ b/src/lib/elm_scroller.c
@@ -192,8 +192,11 @@ _elm_scroller_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, E
    cur = wd->content;
 
    /* Try Focus cycle in subitem */
-   if ((elm_widget_can_focus_get(cur)) || (elm_widget_child_can_focus_get(cur)))
-     return elm_widget_focus_next_get(cur, dir, next);
+   if (elm_widget_focus_get(obj))
+     {
+        if ((elm_widget_can_focus_get(cur)) || (elm_widget_child_can_focus_get(cur)))
+          return elm_widget_focus_next_get(cur, dir, next);
+     }
 
    /* Return */
    *next = (Evas_Object *)obj;