Merge "[Copy&Paste] remove unused copy&paste files Change-Id: Ibca67535f552abfe1479da...

diff --git a/config/slp/base.src b/config/slp/base.src
index 91708c3..9e0dd60 100644 (file)
--- a/config/slp/base.src
+++ b/config/slp/base.src
@@ -30,7 +30,7 @@ group "Elm_Config" struct {
   value "edje_collection_cache" int: 64;
   value "finger_size" int: 60;
   value "fps" double: 6000.0;
-  value "theme" string: "tizen-black-hd";
+  value "theme" string: "blue-hd";
   value "modules" string: "ctxpopup_copypasteUI>entry/api:decarta>map/api";
   value "tooltip_delay" double: 1.0;
   value "cursor_engine_only" uchar: 1;

diff --git a/debian/changelog b/debian/changelog
index 5ceade1..efc630a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+elementary (1.0.0+svn.61256slp2+build115) unstable; urgency=low
+
+  * Package Upload
+  * Git: slp/pkgs/e/elementary
+  * Tag: elementary_1.0.0+svn.61256slp2+build115
+
+ -- Jaehwan Kim <jae.hwan.kim@samsung.com>  Thu, 12 Jan 2012 18:54:28 +0900
+
+elementary (1.0.0+svn.61256slp2+build114) unstable; urgency=low
+
+  * Package Upload
+  * Important Changes
+       change default theme to 'blue-hd'
+  * Git: slp/pkgs/e/elementary
+  * Tag: elementary_1.0.0+svn.61256slp2+build114
+
+ -- Jaehwan Kim <jae.hwan.kim@samsung.com>  Thu, 12 Jan 2012 16:17:39 +0900
+
+elementary (1.0.0+svn.61256slp2+build113) unstable; urgency=low
+
+  * [Config] Remove code related with ATOM_E_SCALE property get.
+  * Git: slp/pkgs/e/elementary
+  * Tag: elementary_1.0.0+svn.61256slp2+build113
+
+ -- Seunggyun Kim <sgyun.kim@samsung.com>  Wed, 04 Jan 2012 19:46:00 +0900
+
 elementary (1.0.0+svn.61256slp2+build112) unstable; urgency=low
 
   * Package Upload.

diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index cbdd6e6..bb57b61 100644 (file)
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -19,7 +19,6 @@ struct _Elm_Naviframe_Content_Item_Pair
 {
    EINA_INLIST;
    const char *part;
-   Evas_Object *content;
    Elm_Naviframe_Item *it;
 };
 
@@ -27,7 +26,6 @@ struct _Elm_Naviframe_Text_Item_Pair
 {
    EINA_INLIST;
    const char *part;
-   const char *text;
 };
 
 struct _Elm_Naviframe_Item
@@ -41,6 +39,8 @@ struct _Elm_Naviframe_Item
    Evas_Object       *title_next_btn;
    Evas_Object       *title_icon;
    const char        *style;
+   Evas_Coord         minw;
+   Evas_Coord         minh;
    Eina_Bool          back_btn: 1;
    Eina_Bool          title_visible: 1;
 };
@@ -64,7 +64,6 @@ 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);
@@ -82,7 +81,6 @@ static void _item_signal_emit_hook(Elm_Object_Item *it,
                                    const char *source);
 static void _item_title_visible_update(Elm_Naviframe_Item *navi_it);
 static void _sizing_eval(Evas_Object *obj);
-static void _item_sizing_eval(Elm_Naviframe_Item *it);
 static void _move(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _resize(void *data,
                     Evas *e,
@@ -156,6 +154,9 @@ 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)
@@ -200,9 +201,6 @@ _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,
@@ -214,7 +212,7 @@ static void _emit_hook(Evas_Object *obj,
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
 
-   edje_object_signal_emit(wd->base, emission, source);
+   elm_object_signal_emit(wd->base, emission, source);
 }
 
 static void
@@ -224,20 +222,6 @@ _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)
@@ -271,19 +255,17 @@ _item_text_set_hook(Elm_Object_Item *it,
         navi_it->text_list = eina_inlist_append(navi_it->text_list,
                                                 EINA_INLIST_GET(pair));
      }
-
-   eina_stringshare_replace(&pair->text, label);
-   edje_object_part_text_set(VIEW(navi_it), buf, label);
+   elm_object_part_text_set(VIEW(navi_it), buf, label);
 
    if (label)
      {
         snprintf(buf, sizeof(buf), "elm,state,%s,show", buf);
-        edje_object_signal_emit(VIEW(navi_it), buf, "elm");
+        elm_object_signal_emit(VIEW(navi_it), buf, "elm");
      }
    else
      {
         snprintf(buf, sizeof(buf), "elm,state,%s,hide", buf);
-        edje_object_signal_emit(VIEW(navi_it), buf, "elm");
+        elm_object_signal_emit(VIEW(navi_it), buf, "elm");
      }
 
    _sizing_eval(WIDGET(navi_it));
@@ -293,8 +275,6 @@ 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"))
@@ -304,12 +284,7 @@ _item_text_get_hook(const Elm_Object_Item *it, const char *part)
    else
      snprintf(buf, sizeof(buf), "%s", part);
 
-   EINA_INLIST_FOREACH(navi_it->text_list, pair)
-     {
-        if (!strcmp(buf, pair->part))
-          return pair->text;
-     }
-   return NULL;
+   return elm_object_part_text_get(VIEW(it), buf);
 }
 
 static void
@@ -351,7 +326,6 @@ 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
@@ -365,12 +339,7 @@ _item_content_get_hook(const Elm_Object_Item *it, const char *part)
      return navi_it->title_icon;
 
    //common parts
-   EINA_INLIST_FOREACH(navi_it->content_list, pair)
-     {
-        if (!strcmp(part, pair->part))
-          return pair->content;
-     }
-   return NULL;
+   return elm_object_part_content_get(VIEW(navi_it), part);
 }
 
 static Evas_Object *
@@ -398,17 +367,16 @@ _item_signal_emit_hook(Elm_Object_Item *it,
                        const char *source)
 {
    ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
-   Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
-   edje_object_signal_emit(VIEW(navi_it), emission, source);
+   elm_object_signal_emit(VIEW(it), emission, source);
 }
 
 static void
 _item_title_visible_update(Elm_Naviframe_Item *navi_it)
 {
    if (navi_it->title_visible)
-     edje_object_signal_emit(VIEW(navi_it), "elm,state,title,show", "elm");
+     elm_object_signal_emit(VIEW(navi_it), "elm,state,title,show", "elm");
    else
-     edje_object_signal_emit(VIEW(navi_it), "elm,state,title,hide", "elm");
+     elm_object_signal_emit(VIEW(navi_it), "elm,state,title,hide", "elm");
 }
 
 static void
@@ -416,26 +384,26 @@ _sizing_eval(Evas_Object *obj)
 {
    Widget_Data *wd;
    Elm_Naviframe_Item *it;
-   wd  = elm_widget_data_get(obj);
-   if (!wd) return;
-
-   EINA_INLIST_FOREACH(wd->stack, it)
-     _item_sizing_eval(it);
-}
-
-static void
-_item_sizing_eval(Elm_Naviframe_Item *it)
-{
-   Widget_Data *wd;
    Evas_Coord x, y, w, h;
-   if (!it) return;
+   Evas_Coord minw = -1, minh = -1;
 
-   wd = elm_widget_data_get(WIDGET(it));
+   wd = elm_widget_data_get(obj);
    if (!wd) return;
 
-   evas_object_geometry_get(WIDGET(it), &x, &y, &w, &h);
-   evas_object_move(VIEW(it), x, y);
-   evas_object_resize(VIEW(it), w, h);
+   evas_object_geometry_get(obj, &x, &y, &w, &h);
+
+   EINA_INLIST_FOREACH(wd->stack, it)
+     {
+        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);
+        if (it->minw > minw) minw = it->minw;
+        if (it->minh > minh) minh = it->minh;
+     }
+   evas_object_size_hint_min_set(obj, minw, minh);
+   evas_object_size_hint_max_set(obj, -1, -1);
 }
 
 static void
@@ -501,7 +469,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);
-   edje_object_signal_emit(VIEW(it), buf, "elm");
+   elm_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);
@@ -517,7 +485,7 @@ _title_prev_btn_del(void *data,
    Elm_Naviframe_Item *it = data;
    it->back_btn = EINA_FALSE;
    it->title_prev_btn = NULL;
-   edje_object_signal_emit(VIEW(it), "elm,state,prev_btn,hide", "elm");
+   elm_object_signal_emit(VIEW(it), "elm,state,prev_btn,hide", "elm");
 }
 
 static void
@@ -528,7 +496,7 @@ _title_next_btn_del(void *data,
 {
    Elm_Naviframe_Item *it = data;
    it->title_next_btn = NULL;
-   edje_object_signal_emit(VIEW(it), "elm,state,next_btn,hide", "elm");
+   elm_object_signal_emit(VIEW(it), "elm,state,next_btn,hide", "elm");
 }
 
 static void
@@ -539,7 +507,7 @@ _title_icon_del(void *data,
 {
    Elm_Naviframe_Item *it = data;
    it->title_icon = NULL;
-   edje_object_signal_emit(VIEW(it), "elm,state,icon,hide", "elm");
+   elm_object_signal_emit(VIEW(it), "elm,state,icon,hide", "elm");
 }
 
 static void
@@ -550,7 +518,7 @@ _item_content_del(void *data,
 {
    Elm_Naviframe_Item *it = data;
    it->content = NULL;
-   edje_object_signal_emit(VIEW(it), "elm,state,content,hide", "elm");
+   elm_object_signal_emit(VIEW(it), "elm,state,content,hide", "elm");
 }
 
 static void
@@ -560,26 +528,25 @@ _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)
      {
-        if (pair->content != content)
+        prev_content = elm_object_part_content_get(VIEW(it), part);
+        if (prev_content != content)
           {
              if (content)
                {
-                  evas_object_event_callback_del(pair->content,
+                  evas_object_event_callback_del(prev_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);
-                  edje_object_signal_emit(VIEW(it), buf, "elm");
+                  elm_object_signal_emit(VIEW(it), buf, "elm");
                }
-             evas_object_del(pair->content);
+             evas_object_del(prev_content);
              if (!content) return;
           }
      }
@@ -597,22 +564,16 @@ _title_content_set(Elm_Naviframe_Item *it,
         it->content_list = eina_inlist_append(it->content_list,
                                               EINA_INLIST_GET(pair));
      }
-   if (pair->content != content)
+   if (prev_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));
      }
-   edje_object_part_swallow(VIEW(it), part, content);
+   elm_object_part_content_set(VIEW(it), part, content);
    snprintf(buf, sizeof(buf), "elm,state,%s,show", part);
-   edje_object_signal_emit(VIEW(it), buf, "elm");
-   pair->content = content;
+   elm_object_signal_emit(VIEW(it), buf, "elm");
 
    _sizing_eval(WIDGET(it));
 }
@@ -623,24 +584,16 @@ _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);
-   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");
+   elm_object_part_content_set(VIEW(it), "elm.swallow.prev_btn", btn);
+   elm_object_signal_emit(VIEW(it), "elm,state,prev_btn,show", "elm");
    it->back_btn = back_btn;
 
    _sizing_eval(WIDGET(it));
@@ -650,24 +603,16 @@ 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);
-   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");
+   elm_object_part_content_set(VIEW(it), "elm.swallow.next_btn", btn);
+   elm_object_signal_emit(VIEW(it), "elm,state,next_btn,show", "elm");
 
    _sizing_eval(WIDGET(it));
 }
@@ -676,24 +621,16 @@ 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);
-   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");
+   elm_object_part_content_set(VIEW(it), "elm.swallow.icon", icon);
+   elm_object_signal_emit(VIEW(it), "elm,state,icon,show", "elm");
 
    _sizing_eval(WIDGET(it));
 }
@@ -704,15 +641,11 @@ _item_content_unset(Elm_Naviframe_Item *it)
    Evas_Object *content = it->content;
    if (!content) return NULL;
 
-   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");
+   elm_object_part_content_unset(VIEW(it), "elm.swallow.content");
+   elm_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;
@@ -725,15 +658,11 @@ _title_prev_btn_unset(Elm_Naviframe_Item *it)
    Evas_Object *content = it->title_prev_btn;
    if (!content) return NULL;
 
-   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");
+   elm_object_part_content_unset(VIEW(it), "elm.swallow.prev_btn");
+   elm_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;
@@ -746,15 +675,11 @@ _title_next_btn_unset(Elm_Naviframe_Item *it)
    Evas_Object *content = it->title_next_btn;
    if (!content) return NULL;
 
-   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");
+   elm_object_part_content_unset(VIEW(it), "elm.swallow.next_btn");
+   elm_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;
@@ -767,15 +692,11 @@ _title_icon_unset(Elm_Naviframe_Item *it)
    Evas_Object *content = it->title_icon;
    if (!content) return NULL;
 
-   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");
+   elm_object_part_content_unset(VIEW(it), "elm.swallow.icon");
+   elm_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;
 
@@ -793,7 +714,7 @@ _title_content_unset(Elm_Naviframe_Item *it, const char *part)
      {
         if (!strcmp(part, pair->part))
           {
-             content = pair->content;
+             content = elm_object_part_content_get(VIEW(it), part);
              eina_stringshare_del(pair->part);
              it->content_list = eina_inlist_remove(it->content_list,
                                                    EINA_INLIST_GET(pair));
@@ -804,16 +725,12 @@ _title_content_unset(Elm_Naviframe_Item *it, const char *part)
 
    if (!content) return NULL;
 
-   elm_widget_sub_object_del(WIDGET(it), content);
-   edje_object_part_unswallow(VIEW(it), content);
+   elm_object_part_content_unset(VIEW(it), part);
    snprintf(buf, sizeof(buf), "elm,state,%s,hide", part);
-   edje_object_signal_emit(VIEW(it), buf, "elm");
+   elm_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;
@@ -825,32 +742,22 @@ _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);
-        evas_object_event_callback_del(content_pair->content,
+        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,
                                        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);
@@ -862,7 +769,6 @@ _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);
@@ -943,26 +849,17 @@ _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_widget_sub_object_add(WIDGET(navi_it), content);
-   edje_object_part_swallow(VIEW(navi_it),
-                            "elm.swallow.content",
-                            content);
+   elm_object_part_content_set(VIEW(navi_it), "elm.swallow.content", content);
+
    if (content)
-     edje_object_signal_emit(VIEW(navi_it),
-                             "elm,state,content,show",
-                             "elm");
+     elm_object_signal_emit(VIEW(navi_it), "elm,state,content,show", "elm");
    else
-     edje_object_signal_emit(VIEW(navi_it),
-                             "elm,state,content,hide",
-                             "elm");
+     elm_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));
 }
@@ -979,63 +876,41 @@ _item_style_set(Elm_Naviframe_Item *navi_it, const char *item_style)
 
    if (!item_style)
      {
-        sprintf(buf, "item/basic");
+        strcpy(buf, "item/basic");
         eina_stringshare_replace(&navi_it->style, "basic");
      }
    else
      {
-        if (strlen(item_style) > sizeof(buf))
-          WRN("too much long style name! : naviframe=%p", WIDGET(navi_it));
-        sprintf(buf, "item/%s", item_style);
+        snprintf(buf, sizeof(buf), "item/%s", item_style);
         eina_stringshare_replace(&navi_it->style, item_style);
      }
-   _elm_theme_object_set(WIDGET(navi_it),
-                         VIEW(navi_it),
-                         "naviframe",
-                         buf,
-                         elm_widget_style_get(WIDGET(navi_it)));
+   elm_layout_theme_set(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,
-                          text_pair->text);
+     _item_text_set_hook((Elm_Object_Item *) navi_it,
+                         text_pair->part,
+                         elm_object_part_text_get(VIEW(navi_it),
+                                                  text_pair->part));
 
    EINA_INLIST_FOREACH(navi_it->content_list, content_pair)
-      _item_content_set_hook((Elm_Object_Item *) navi_it,
-                             content_pair->part,
-                             content_pair->content);
+     _item_content_set_hook((Elm_Object_Item *) navi_it,
+                            content_pair->part,
+                            elm_object_part_content_get(VIEW(navi_it),
+                                                        content_pair->part));
    //content
    if (navi_it->content)
-     {
-        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");
-     }
+     elm_object_signal_emit(VIEW(navi_it), "elm,state,content,show", "elm");
 
    //prev button
    if (navi_it->title_prev_btn)
-     {
-        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");
-     }
+     elm_object_signal_emit(VIEW(navi_it), "elm,state,prev_btn,show", "elm");
 
    //next button
    if (navi_it->title_next_btn)
-     {
-        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");
-     }
+     elm_object_signal_emit(VIEW(navi_it), "elm,state,next_btn,show", "elm");
 
    navi_it->title_visible = EINA_TRUE;
    _sizing_eval(WIDGET(navi_it));
@@ -1073,23 +948,26 @@ _item_new(Evas_Object *obj,
    elm_widget_item_signal_emit_hook_set(it, _item_signal_emit_hook);
 
    //item base layout
-   VIEW(it) = edje_object_add(evas_object_evas_get(obj));
-   edje_object_mirrored_set(VIEW(it), elm_widget_mirrored_get(obj));
+   VIEW(it) = elm_layout_add(obj);
    evas_object_smart_member_add(VIEW(it), wd->base);
-   elm_widget_sub_object_add(obj, VIEW(it));
-   edje_object_signal_callback_add(VIEW(it),
+
+   evas_object_event_callback_add(VIEW(it),
+                                  EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                  _changed_size_hints,
+                                  obj);
+   elm_object_signal_callback_add(VIEW(it),
                                    "elm,action,show,finished",
                                    "",
                                    _show_finished, it);
-   edje_object_signal_callback_add(VIEW(it),
+   elm_object_signal_callback_add(VIEW(it),
                                    "elm,action,pushed,finished",
                                    "",
                                    _pushed_finished, it);
-   edje_object_signal_callback_add(VIEW(it),
+   elm_object_signal_callback_add(VIEW(it),
                                    "elm,action,popped,finished",
                                    "",
                                    _popped_finished, it);
-   edje_object_signal_callback_add(VIEW(it),
+   elm_object_signal_callback_add(VIEW(it),
                                    "elm,action,title,clicked",
                                    "",
                                    _title_clicked, it);
@@ -1112,6 +990,16 @@ _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)
 {
@@ -1128,12 +1016,17 @@ 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 = edje_object_add(e);
-   edje_object_mirrored_set(wd->base, elm_widget_mirrored_get(obj));
+   wd->base = elm_layout_add(parent);
+   evas_object_event_callback_add(wd->base,
+                                  EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                  _changed_size_hints,
+                                  obj);
    elm_widget_resize_object_set(obj, wd->base);
-   _elm_theme_object_set(obj, wd->base, "naviframe", "base", "default");
+   elm_layout_theme_set(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);
@@ -1173,14 +1066,10 @@ 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);
           }
-        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));
+        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)));
      }
    wd->stack = eina_inlist_append(wd->stack, EINA_INLIST_GET(it));
    _sizing_eval(obj);
@@ -1272,14 +1161,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);
           }
-        edje_object_signal_emit(VIEW(it), "elm,state,cur,popped", "elm");
+        elm_object_signal_emit(VIEW(it), "elm,state,cur,popped", "elm");
         evas_object_show(VIEW(prev_it));
         evas_object_raise(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));
+        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)));
      }
    else
      _item_del(it);
@@ -1336,16 +1225,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);
      }
-   edje_object_signal_emit(VIEW(prev_it),
-                           "elm,state,cur,pushed",
-                           "elm");
+   elm_object_signal_emit(VIEW(prev_it),
+                          "elm,state,cur,pushed",
+                          "elm");
    evas_object_show(VIEW(navi_it));
    evas_object_raise(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));
+   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)));
 }
 
 EAPI void
@@ -1369,7 +1258,7 @@ elm_naviframe_item_del(Elm_Object_Item *it)
                                             Elm_Naviframe_Item);
         evas_object_show(VIEW(navi_it));
         evas_object_raise(VIEW(navi_it));
-        edje_object_signal_emit(VIEW(navi_it), "elm,state,visible", "elm");
+        elm_object_signal_emit(VIEW(navi_it), "elm,state,visible", "elm");
      }
    else
      {

diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index 16e7a3f..605baa7 100644 (file)
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -1749,24 +1749,6 @@ _elm_config_sub_init(void)
                                ECORE_X_EVENT_MASK_WINDOW_PROPERTY);
         _prop_change_handler = ecore_event_handler_add
             (ECORE_X_EVENT_WINDOW_PROPERTY, _prop_change, NULL);
-        if (!getenv("ELM_SCALE"))
-          {
-             if (ecore_x_window_prop_card32_get(_root_1st,
-                                                _atom[ATOM_E_SCALE],
-                                                &val, 1) > 0)
-               {
-                  if (val > 0)
-                    {
-                       _elm_config->scale = (double)val / 1000.0;
-     // FIXME: hack until e export finger size too
-                       if (!getenv("ELM_FINGER_SIZE"))
-                         {
-                            _elm_config->finger_size = 40.0 * _elm_config->scale;
-                         }
-                       edje_scale_set(_elm_config->scale);
-                    }
-               }
-          }
         if (!getenv("ELM_FINGER_SIZE"))
           {
              if (ecore_x_window_prop_card32_get(_root_1st,

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index a7b53c6..cb37701 100644 (file)
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -33,6 +33,7 @@ struct _Widget_Data
    int mgf_type;
    Ecore_Job *deferred_recalc_job;
    Ecore_Job *region_get_job;
+   Ecore_Job *region_recalc_job;
    Ecore_Event_Handler *sel_notify_handler;
    Ecore_Event_Handler *sel_clear_handler;
    Ecore_Timer *delay_write;
@@ -163,7 +164,8 @@ static void _magnifier_hide(void *data);
 static void _magnifier_move(void *data);
 static Evas_Coord_Rectangle _layout_region_get(Evas_Object *data);
 static Evas_Coord_Rectangle _viewport_region_get(Evas_Object *data);
-static void _elm_win_region_get_job(void *data);
+static void _region_get_job(void *data);
+static void _region_recalc_job(void *data);
 
 static const char SIG_CHANGED[] = "changed";
 static const char SIG_ACTIVATED[] = "activated";
@@ -509,6 +511,7 @@ _del_hook(Evas_Object *obj)
    if (wd->password_text) eina_stringshare_del(wd->password_text);
    if (wd->deferred_recalc_job) ecore_job_del(wd->deferred_recalc_job);
    if (wd->region_get_job) ecore_job_del(wd->region_get_job);
+   if (wd->region_recalc_job) ecore_job_del(wd->region_recalc_job);
    if (wd->append_text_idler)
      {
         ecore_idler_del(wd->append_text_idler);
@@ -1081,7 +1084,7 @@ _move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    if (!_elm_config->desktop_entry)
      {
         if (wd->region_get_job) ecore_job_del(wd->region_get_job);
-        wd->region_get_job = ecore_job_add(_elm_win_region_get_job, data);
+        wd->region_get_job = ecore_job_add(_region_get_job, data);
      }
 }
 
@@ -1109,7 +1112,7 @@ _resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event
    if (!_elm_config->desktop_entry)
      {
         if (wd->region_get_job) ecore_job_del(wd->region_get_job);
-        wd->region_get_job = ecore_job_add(_elm_win_region_get_job, data);
+        wd->region_get_job = ecore_job_add(_region_get_job, data);
      }
 }
 
@@ -2071,7 +2074,7 @@ _layout_region_get(Evas_Object *data)
 }
 
 static void
-_elm_win_region_get_job(void *data)
+_region_get_job(void *data)
 {
    Widget_Data *wd = elm_widget_data_get(data);
    Evas_Coord_Rectangle ret_rect;
@@ -2080,8 +2083,23 @@ _elm_win_region_get_job(void *data)
 
    if (!_elm_config->desktop_entry)
      {
+        if (wd->region_recalc_job) ecore_job_del(wd->region_recalc_job);
+        wd->region_recalc_job = ecore_job_add(_region_recalc_job, data);
+
         evas_smart_objects_calculate(evas_object_evas_get(data));
+     }
+}
+
+static void
+_region_recalc_job(void *data)
+{
+   Widget_Data *wd = elm_widget_data_get(data);
+   Evas_Coord_Rectangle ret_rect;
+   if (!wd) return;
+   wd->region_recalc_job = NULL;
 
+   if (!_elm_config->desktop_entry)
+     {
         ret_rect = _viewport_region_get(data);
         edje_object_part_text_viewport_region_set(wd->ent, "elm.text", ret_rect.x, ret_rect.y, ret_rect.w, ret_rect.h);
         ret_rect = _layout_region_get(data);
@@ -2089,7 +2107,6 @@ _elm_win_region_get_job(void *data)
      }
 }
 
-
 static void
 _signal_selection_end(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
 {

diff --git a/src/lib/elm_notify.c b/src/lib/elm_notify.c
index bae56a3..22454dc 100644 (file)
--- a/src/lib/elm_notify.c
+++ b/src/lib/elm_notify.c
@@ -568,7 +568,6 @@ elm_notify_parent_set(Evas_Object *obj, Evas_Object *parent)
                                        _parent_del, obj);
         evas_object_event_callback_add(parent, EVAS_CALLBACK_HIDE,
                                        _parent_hide, obj);
-        edje_object_part_swallow(wd->notify, "elm.swallow.parent", parent);
         _sizing_eval(obj);
      }
    _calc(obj);