[genlist] prevent on_focus_hook at zero items

[framework/uifw/elementary.git] / src / lib / elm_genlist.c

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index c5a5f00..a032a30 100644 (file)
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -294,6 +294,10 @@ static const char SIG_DRAG_START_RIGHT[] = "drag,start,right";
 static const char SIG_DRAG_STOP[] = "drag,stop";
 static const char SIG_DRAG[] = "drag";
 static const char SIG_LONGPRESSED[] = "longpressed";
+static const char SIG_SCROLL_ANIM_START[] = "scroll,anim,start";
+static const char SIG_SCROLL_ANIM_STOP[] = "scroll,anim,stop";
+static const char SIG_SCROLL_DRAG_START[] = "scroll,drag,start";
+static const char SIG_SCROLL_DRAG_STOP[] = "scroll,drag,stop";
 static const char SIG_SCROLL_EDGE_TOP[] = "scroll,edge,top";
 static const char SIG_SCROLL_EDGE_BOTTOM[] = "scroll,edge,bottom";
 static const char SIG_SCROLL_EDGE_LEFT[] = "scroll,edge,left";
@@ -324,6 +328,10 @@ static const Evas_Smart_Cb_Description _signals[] = {
    {SIG_DRAG_STOP, ""},
    {SIG_DRAG, ""},
    {SIG_LONGPRESSED, ""},
+   {SIG_SCROLL_ANIM_START, ""},
+   {SIG_SCROLL_ANIM_STOP, ""},
+   {SIG_SCROLL_DRAG_START, ""},
+   {SIG_SCROLL_DRAG_STOP, ""},
    {SIG_SCROLL_EDGE_TOP, ""},
    {SIG_SCROLL_EDGE_BOTTOM, ""},
    {SIG_SCROLL_EDGE_LEFT, ""},
@@ -569,7 +577,7 @@ _on_focus_hook(void        *data __UNUSED__,
      {
         elm_object_signal_emit(wd->obj, "elm,action,focus", "elm");
         evas_object_focus_set(wd->obj, EINA_TRUE);
-        if ((wd->selected) && (!wd->last_selected_item))
+        if ((wd->items) && (wd->selected) && (!wd->last_selected_item))
           wd->last_selected_item = eina_list_data_get(wd->selected);
      }
    else
@@ -2123,6 +2131,7 @@ _item_realize(Elm_Genlist_Item *it,
              const char *key;
              if (it->renamed)
                {
+                  edje_object_signal_emit(it->base.view, "elm,state,rename,enabled", "elm");
                   it->icons =
                      elm_widget_stringlist_get(edje_object_data_get(it->base.view, "renames"));
                   EINA_LIST_FOREACH(it->icons, l, key)
@@ -2482,11 +2491,6 @@ _item_block_position(Item_Block *itb,
                   if (vis)
                     {
                        if (!it->realized) _item_realize(it, in, EINA_FALSE);
-                       if (it->renamed)
-                         {
-                            if (it->wd->edit_mode) edje_object_signal_emit(it->edit_obj, "elm,state,rename,enabled", "elm");
-                            edje_object_signal_emit(it->base.view, "elm,state,rename,enabled", "elm");
-                         }
                     }
                }
              if (it->realized)
@@ -3200,6 +3204,38 @@ _freeze_off(void        *data __UNUSED__,
 }
 
 static void
+_scr_anim_start(void        *data,
+                Evas_Object *obj __UNUSED__,
+                void        *event_info __UNUSED__)
+{
+   evas_object_smart_callback_call(data, SIG_SCROLL_ANIM_START, NULL);
+}
+
+static void
+_scr_anim_stop(void        *data,
+               Evas_Object *obj __UNUSED__,
+               void        *event_info __UNUSED__)
+{
+   evas_object_smart_callback_call(data, SIG_SCROLL_ANIM_STOP, NULL);
+}
+
+static void
+_scr_drag_start(void            *data,
+                Evas_Object     *obj __UNUSED__,
+                void            *event_info __UNUSED__)
+{
+   evas_object_smart_callback_call(data, SIG_SCROLL_DRAG_START, NULL);
+}
+
+static void
+_scr_drag_stop(void            *data,
+               Evas_Object     *obj __UNUSED__,
+               void            *event_info __UNUSED__)
+{
+   evas_object_smart_callback_call(data, SIG_SCROLL_DRAG_STOP, NULL);
+}
+
+static void
 _scroll_edge_left(void        *data,
                   Evas_Object *scr __UNUSED__,
                   void        *event_info __UNUSED__)
@@ -3464,6 +3500,10 @@ elm_genlist_add(Evas_Object *parent)
                                        _elm_config->thumbscroll_bounce_enable);
    elm_widget_resize_object_set(obj, wd->scr);
 
+   evas_object_smart_callback_add(wd->scr, "animate,start", _scr_anim_start, obj);
+   evas_object_smart_callback_add(wd->scr, "animate,stop", _scr_anim_stop, obj);
+   evas_object_smart_callback_add(wd->scr, "drag,start", _scr_drag_start, obj);
+   evas_object_smart_callback_add(wd->scr, "drag,stop", _scr_drag_stop, obj);
    evas_object_smart_callback_add(wd->scr, "edge,left", _scroll_edge_left, obj);
    evas_object_smart_callback_add(wd->scr, "edge,right", _scroll_edge_right,
                                   obj);
@@ -3703,6 +3743,13 @@ _queue_process(Widget_Data *wd)
           {
              showme = _item_block_recalc(it->block, it->block->num, EINA_TRUE);
              it->block->changed = 0;
+             if(wd->pan_changed)
+               {
+                  if (wd->calc_job) ecore_job_del(wd->calc_job);
+                  wd->calc_job = NULL;
+                  _calc_job(wd);
+                  wd->pan_changed = EINA_FALSE;
+               }
           }
         if (showme) it->block->showme = EINA_TRUE;
         if (eina_inlist_count(wd->blocks) > 1)
@@ -4040,6 +4087,7 @@ elm_genlist_clear(Evas_Object *obj)
         if (itb->items) eina_list_free(itb->items);
         free(itb);
      }
+   wd->pan_changed = EINA_TRUE;
    if (wd->calc_job)
      {
         ecore_job_del(wd->calc_job);
@@ -5372,8 +5420,6 @@ _item_moving_effect_timer_cb(void *data)
                   it = elm_genlist_item_prev_get(it);
                }
           }
-        if (wd->calc_job) ecore_job_del(wd->calc_job);
-        wd->calc_job = ecore_job_add(_calc_job, wd);
      }
    else
      {
@@ -5431,6 +5477,7 @@ _item_moving_effect_timer_cb(void *data)
 
         evas_object_smart_callback_call(wd->pan_smart, "changed", NULL);
         evas_object_smart_callback_call(wd->obj, "effect_done", NULL);
+        evas_object_smart_changed(wd->pan_smart);
         return ECORE_CALLBACK_CANCEL;
      }
    return ECORE_CALLBACK_RENEW;
@@ -5588,6 +5635,7 @@ _effect_item_realize(Elm_Genlist_Item *it, Eina_Bool effect_on)
              const Eina_List *l;
              const char *key;
 
+             if (it->renamed) edje_object_signal_emit(it->edit_obj, "elm,state,rename,enabled", "elm");
              it->icons = elm_widget_stringlist_get(edje_object_data_get(it->edit_obj, "edit_icons"));
              EINA_LIST_FOREACH(it->icons, l, key)
                {