Merge "[*][Elm_genlist] add changeme flag for proper update genlist's update job...

diff --git a/debian/changelog b/debian/changelog
index e20a15c..fbfb078 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+elementary (1.0.0+svn.61256slp2+build19) unstable; urgency=low
+
+  * Recorver elm_navigationbar_title_object_get
+  * Git: 165.213.180.234:/slp/pkgs/e/elementary
+  * Tag: elementary_1.0.0+svn.61256slp2+build19
+
+ -- ChunEon Park <chuneon.park@samsung.com>  Wed, 24 Aug 2011 08:51:24 +0900
+
+elementary (1.0.0+svn.61256slp2+build18) unstable; urgency=low
+
+  * Package Upload
+  * Git: 165.213.180.234:/slp/pkgs/e/elementary
+  * Tag: elementary_1.0.0+svn.61256slp2+build18
+
+ -- ChunEon Park <chuneon.park@samsung.com>  Tue, 23 Aug 2011 19:29:51 +0900
+
+elementary (1.0.0+svn.61256slp2+build17) unstable; urgency=low
+
+  * Package Upload
+  * Important Changes
+       [editfield] change the location of elm_entry_coursor_end set just after focusing
+  * Git: 165.213.180.234:/slp/pkgs/e/elementary
+  * Tag: elementary_1.0.0+svn.61256slp2+build17
+
+ -- WooHyun Jung <wh0705.jung@samsung.com>  Tue, 23 Aug 2011 10:25:59 +0900
+
 elementary (1.0.0+svn.61256slp2+build16) unstable; urgency=low
 
   * Package Upload

diff --git a/packaging/elementary.spec b/packaging/elementary.spec
index f7d9238..29abb22 100644 (file)
--- a/packaging/elementary.spec
+++ b/packaging/elementary.spec
@@ -5,7 +5,7 @@ Release:    1
 Group:      TO_BE/FILLED_IN
 License:    LGPL
 URL:        http://trac.enlightenment.org/e/wiki/Elementary
-Source0:    elementary-%{version}.tar.bz2
+Source0:    %{name}-%{version}.tar.bz2
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires:  pkgconfig(ecore)
@@ -50,7 +50,7 @@ EFL toolkit for small touchscreens (devel)
 
 
 %prep
-%setup -q -n %{name}
+%setup -q
 
 %build
 

diff --git a/src/lib/elc_navigationbar.c b/src/lib/elc_navigationbar.c
index fdfc723..87083f4 100644 (file)
--- a/src/lib/elc_navigationbar.c
+++ b/src/lib/elc_navigationbar.c
@@ -789,32 +789,36 @@ elm_navigationbar_pop(Evas_Object *obj)
    cb = ELM_NEW(Transit_Cb_Data);
 
    //Previous page is exist.
-   if (prev_it && it)
-     {
-        cb->prev_it = prev_it;
-        cb->it = it;
-        cb->pop = EINA_TRUE;
-        if (prev_it->title_obj)
-          edje_object_part_unswallow(wd->base, prev_it->title_obj);
-        if (prev_it->title_btns[ELM_NAVIGATIONBAR_PREV_BUTTON])
-          edje_object_part_unswallow(wd->base, prev_it->title_btns[ELM_NAVIGATIONBAR_PREV_BUTTON]);
-        if (prev_it->title_btns[ELM_NAVIGATIONBAR_NEXT_BUTTON])
-          edje_object_part_unswallow(wd->base, prev_it->title_btns[ELM_NAVIGATIONBAR_NEXT_BUTTON]);
-        if (prev_it->icon)
-          edje_object_part_unswallow(wd->base, prev_it->icon);
-        _item_sizing_eval(it);
-     }
-   //This case, it's the last page.
-   else if (prev_it)
+   if (prev_it)
      {
-        cb->prev_it = prev_it;
-        cb->it = NULL;
-        cb->pop = EINA_TRUE;
-        //TODO: seems that flag is inverted.
-        cb->first_page = EINA_FALSE;
+        if (it)
+          {
+             cb->prev_it = prev_it;
+             cb->it = it;
+             cb->pop = EINA_TRUE;
+             if (prev_it->title_obj)
+               edje_object_part_unswallow(wd->base, prev_it->title_obj);
+             if (prev_it->title_btns[ELM_NAVIGATIONBAR_PREV_BUTTON])
+               edje_object_part_unswallow(wd->base, prev_it->title_btns[ELM_NAVIGATIONBAR_PREV_BUTTON]);
+             if (prev_it->title_btns[ELM_NAVIGATIONBAR_NEXT_BUTTON])
+               edje_object_part_unswallow(wd->base, prev_it->title_btns[ELM_NAVIGATIONBAR_NEXT_BUTTON]);
+             if (prev_it->icon)
+               edje_object_part_unswallow(wd->base, prev_it->icon);
+             _item_sizing_eval(it);
+          }
+        else
+          {
+             cb->prev_it = prev_it;
+             cb->it = NULL;
+             cb->pop = EINA_TRUE;
+             //TODO: seems that flag is inverted.
+             cb->first_page = EINA_FALSE;
+          }
+
+        if (prev_it->content)
+          elm_object_tree_unfocusable_set(prev_it->content, EINA_TRUE);
      }
-   if (prev_it->content)
-     elm_object_tree_unfocusable_set(prev_it->content, EINA_TRUE);
+
    cb->navibar = obj;
    _transition_complete_cb(cb);
    wd->popping = EINA_TRUE;
@@ -852,6 +856,9 @@ elm_navigationbar_to_content_pop(Evas_Object *obj, Evas_Object *content)
    //find item to be popped and to be shown
    it = prev_it = NULL;
    ll = eina_list_last(wd->stack);
+
+   if (elm_navigationbar_content_top_get(obj) == content) return;
+
    if (ll)
      {
         prev_it = ll->data;
@@ -892,6 +899,8 @@ elm_navigationbar_to_content_pop(Evas_Object *obj, Evas_Object *content)
         _transition_complete_cb(cb);
 
         elm_pager_to_content_pop(wd->pager, content);
+
+        free(cb);
      }
 }
 

diff --git a/src/lib/elm_editfield.c b/src/lib/elm_editfield.c
index e20e63d..1815081 100644 (file)
--- a/src/lib/elm_editfield.c
+++ b/src/lib/elm_editfield.c
@@ -159,8 +159,12 @@ _show_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *even
 {
    Widget_Data *wd = elm_widget_data_get(data);
    if (!wd) return;
-   if (wd->editing && wd->single_line)  // FIXME : single_line is not needed for this conditional state after TEXTBLOCK fixing
-     elm_object_focus(wd->entry);
+   if ((wd->single_line) && (!wd->editing))  // FIXME : single_line is not needed for this conditional state after TEXTBLOCK fixing
+     {
+        elm_object_focus(wd->entry);
+        elm_entry_cursor_end_set(wd->entry);
+        wd->editing = EINA_TRUE;
+     }
 }
 
 static Eina_Bool
@@ -242,13 +246,12 @@ _signal_mouse_clicked(void *data, Evas_Object *obj __UNUSED__, const char *emiss
      {
         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;
-
-        if (!wd->single_line)        //FIXME : after fixing TEXTBLOCK, this should be deleted
-          elm_object_focus(wd->entry);
+        if ((!wd->single_line) && (!wd->editing)) //FIXME : after fixing TEXTBLOCK, this should be deleted
+          {
+             elm_object_focus(wd->entry);
+             elm_entry_cursor_end_set(wd->entry);
+             wd->editing = EINA_TRUE;
+          }
 
         if(!(_empty_entry(wd->entry)) && (wd->eraser_show))
            edje_object_signal_emit(wd->base, "elm,state,eraser,show", "elm");

diff --git a/src/lib/elm_transit.c b/src/lib/elm_transit.c
index 3cb86ea..ed12aff 100644 (file)
--- a/src/lib/elm_transit.c
+++ b/src/lib/elm_transit.c
@@ -93,7 +93,7 @@ static void _transit_obj_remove(Elm_Transit *transit, Evas_Object *obj);
 static void _transit_effect_del(Elm_Transit *transit, Elm_Transit_Effect_Module *effect_module);
 static void _transit_remove_dead_effects(Elm_Transit *transit);
 static void _transit_del(Elm_Transit *transit);
-static void _transit_animate_op(Elm_Transit *transit, double progress);
+static Eina_Bool _transit_animate_op(Elm_Transit *transit, double progress);
 static Eina_Bool _transit_animate_cb(void *data);
 
 static char *_transit_key= "_elm_transit_key";
@@ -282,7 +282,8 @@ _transit_del(Elm_Transit *transit)
    free(transit);
 }
 
-static void
+//If the transit is deleted then EINA_FALSE is retruned.
+static Eina_Bool
 _transit_animate_op(Elm_Transit *transit, double progress)
 {
    Elm_Transit_Effect_Module *effect_module;
@@ -296,10 +297,17 @@ _transit_animate_op(Elm_Transit *transit, double progress)
      }
    transit->walking--;
 
-   if (transit->walking) return;
+   if (transit->walking) return EINA_TRUE;
+
+   if (transit->deleted)
+     {
+        _transit_del(transit);
+        return EINA_FALSE;
+     }
 
-   if (transit->deleted) _transit_del(transit);
    else if (transit->effects_pending_del) _transit_remove_dead_effects(transit);
+
+   return EINA_TRUE;
 }
 
 static Eina_Bool
@@ -334,7 +342,11 @@ _transit_animate_cb(void *data)
    /* Reverse? */
    if (transit->repeat.reverse) transit->progress = 1 - transit->progress;
 
-   if (transit->time.duration > 0) _transit_animate_op(transit, transit->progress);
+   if (transit->time.duration > 0)
+     {
+        if (!_transit_animate_op(transit, transit->progress))
+          return ECORE_CALLBACK_CANCEL;
+     }
 
    /* Not end. Keep going. */
    if (elapsed_time < duration) return ECORE_CALLBACK_RENEW;