[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 a3ebeca..a032a30 100644 (file)
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -577,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
@@ -2131,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)
@@ -2490,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)
@@ -3747,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)
@@ -4084,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);
@@ -5631,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)
                {