Merge "[elm_multibuttonentry]Add entry focus set in _on_focus_hook() Change-Id: I164e...

diff --git a/debian/changelog b/debian/changelog
index 4ae8056..ea58633 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+elementary (1.0.0+svn.61256slp2+build14) unstable; urgency=low
+
+  * Package Upload
+  * Important Changes
+       [window] fix the wrong signal name matching
+  * Git: 165.213.180.234:/slp/pkgs/e/elementary
+  * Tag: elementary_1.0.0+svn.61256slp2+build14
+
+ -- WooHyun Jung <wh0705.jung@samsung.com>  Thu, 11 Aug 2011 18:01:03 +0900
+
 elementary (1.0.0+svn.61256slp2+build13) unstable; urgency=low
 
   * Package Upload

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index ba58fcd..8513883 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -7947,6 +7947,7 @@ extern "C" {
    EAPI void         elm_navigationbar_title_label_set(Evas_Object *obj, Evas_Object *content, const char *title);
    EAPI const char  *elm_navigationbar_title_label_get(Evas_Object *obj, Evas_Object *content);
    EAPI void         elm_navigationbar_title_object_add(Evas_Object *obj, Evas_Object *content, Evas_Object *title_obj);
+   EAPI Evas_Object *elm_navigationbar_title_object_get(Evas_Object *obj, Evas_Object *content);
    EAPI Eina_List   *elm_navigationbar_title_object_list_get(Evas_Object *obj, Evas_Object *content);
    EAPI Evas_Object *elm_navigationbar_content_top_get(Evas_Object *obj);
    EAPI Evas_Object *elm_navigationbar_content_bottom_get(Evas_Object *obj);

diff --git a/src/lib/elm_editfield.c b/src/lib/elm_editfield.c
index 2e828ca..b632fb5 100644 (file)
--- a/src/lib/elm_editfield.c
+++ b/src/lib/elm_editfield.c
@@ -240,13 +240,13 @@ _signal_mouse_clicked(void *data, Evas_Object *obj __UNUSED__, const char *emiss
      }
    else if(strcmp(source, "left_icon") && strcmp(source, "right_icon") && strcmp(source, "eraser"))
      {
+        edje_object_signal_emit(wd->base, "elm,state,over,hide", "elm");
+
         if(wd->editing == EINA_FALSE)
            elm_entry_cursor_end_set(wd->entry);
 
         wd->editing = EINA_TRUE;
 
-        edje_object_signal_emit(wd->base, "elm,state,over,hide", "elm");
-
         if (!wd->single_line)        //FIXME : after fixing TEXTBLOCK, this should be deleted
           elm_object_focus(wd->entry);
 

diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 1d42b57..ca91dfa 100644 (file)
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -142,8 +142,8 @@ static void _elm_win_focus_highlight_anim_end(void *data, Evas_Object *obj, cons
 static void _elm_win_focus_highlight_reconfigure(Elm_Win *win);
 
 static const char SIG_DELETE_REQUEST[] = "delete,request";
-static const char SIG_FOCUS_OUT[] = "focus,in";
-static const char SIG_FOCUS_IN[] = "focus,out";
+static const char SIG_FOCUS_OUT[] = "focus,out";
+static const char SIG_FOCUS_IN[] = "focus,in";
 static const char SIG_MOVED[] = "moved";
 
 static const Evas_Smart_Cb_Description _signals[] = {