backport jaeun's fix.

SVN revision: 82865

diff --git a/ChangeLog b/ChangeLog
index 4f76b40ce72d4ff2e9a225dbc5663cf60d254edc..fdd3e64c51de6ce61edaa5f463e119c4556b50a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -710,7 +710,8 @@
 2013-01-16  WooHyun Jung
 
         * elm_plug should call elm_widget_can_focus_set after adding parent class.
+        * Now, widget itself is the object which gets mouse_up event for stealing focus from another object. By this change, a widget with scroller interface can change its focus state before mouse_up of hit_rect.
 
-2013-01-16  WooHyun Jung
+2013-01-16  Jaeun Choi
 
-        * Now, widget itself is the object which gets mouse_up event for stealing focus from another object. By this change, a widget with scroller interface can change its focus state before mouse_up of hit_rect.
+        * Fix bug where index is not re-filled if autohide disabled

diff --git a/NEWS b/NEWS
index 578c9d2f848d33aa027369e5cf20413d1273ec09..ea09da52fc18b91b0bbb219541515311bc440837 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ Fixes:
    * Fix "changed" signal being sent twice in case of toggle style when check is clicked.
    * elm_plug should call elm_widget_can_focus_set after adding parent class.
    * Now, widget itself is the object which gets mouse_up event for stealing focus from another object. By this change, a widget with scroller interface can change its focus state before mouse_up of hit_rect.
+   * Fix index refill bug when autohide disabled.
 
 Changes since Elementary 1.7.4:
 -------------------------

diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index a05c3fc86662d521ff106c54bd765a1533808e7b..99afbb373e2ae450662885f7fa79228fcaf33bf5 100644 (file)
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -142,16 +142,6 @@ _index_box_auto_fill(Evas_Object *obj,
         evas_object_show(o);
 
         i++;
-        evas_object_smart_calculate(box); // force a calc so we know the size
-        evas_object_size_hint_min_get(box, &mw, &mh);
-        if (mh > h)
-          {
-             _index_box_clear(obj, box, level);
-             if (i > 0)
-               {
-                  // FIXME: only i objects fit! try again. overflows right now
-               }
-          }
      }
 
    evas_object_smart_calculate(box);
@@ -452,7 +442,6 @@ _on_mouse_down(void *data,
    if (!sd->autohide_disabled)
      {
         _index_box_clear(data, sd->bx[1], 1);
-        _index_box_auto_fill(data, sd->bx[0], 0);
         elm_layout_signal_emit(data, "elm,state,active", "elm");
      }
    _sel_eval(data, ev->canvas.x, ev->canvas.y);
@@ -693,7 +682,6 @@ elm_index_autohide_disabled_set(Evas_Object *obj,
    if (sd->autohide_disabled)
      {
         _index_box_clear(obj, sd->bx[1], 1);
-        _index_box_auto_fill(obj, sd->bx[0], 0);
         elm_layout_signal_emit(obj, "elm,state,active", "elm");
      }
    else
@@ -948,8 +936,13 @@ elm_index_level_go(Evas_Object *obj,
    ELM_INDEX_CHECK(obj);
    ELM_INDEX_DATA_GET(obj, sd);
 
+   _index_box_clear(obj, sd->bx[0], 0);
    _index_box_auto_fill(obj, sd->bx[0], 0);
-   if (sd->level == 1) _index_box_auto_fill(obj, sd->bx[1], 1);
+   if (sd->level == 1)
+     {
+        _index_box_clear(obj, sd->bx[1], 1);
+        _index_box_auto_fill(obj, sd->bx[1], 1);
+     }
 }
 
 EAPI void