Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary...

[framework/uifw/elementary.git] / src / bin / test_index.c

diff --git a/src/bin/test_index.c b/src/bin/test_index.c
index e8f7acd..be43dab 100644 (file)
--- a/src/bin/test_index.c
+++ b/src/bin/test_index.c
@@ -26,6 +26,8 @@ enum _api_state
    INDEX_PREPEND,
    INDEX_ITEM_DEL,
    INDEX_ITEM_FIND,
+   INDEX_HORIZONTAL,
+   INDEX_INDICATOR_DISABLED,
    INDEX_CLEAR,
    API_STATE_LAST
 };
@@ -37,28 +39,33 @@ set_api_state(api_data *api)
    Idx_Data_Type *d = &api->dt;
    switch(api->state)
      { /* Put all api-changes under switch */
-      case INDEX_LEVEL_SET: /* 0 */
+      case INDEX_LEVEL_SET:
          elm_index_autohide_disabled_set(d->id, EINA_TRUE);
          elm_index_item_level_set(d->id, (elm_index_item_level_get(d->id) ? 0 : 1));
          break;
 
-      case INDEX_ACTIVE_SET: /* 1 */
+      case INDEX_ACTIVE_SET:
          elm_index_autohide_disabled_set(d->id, EINA_FALSE);
          break;
 
-      case INDEX_APPEND_RELATIVE: /* 2 */
-             elm_index_item_insert_after(d->id, elm_index_item_find(d->id, d->item), "W", NULL, d->item);
+      case INDEX_APPEND_RELATIVE:
+         elm_index_item_insert_after(d->id,
+                                     elm_index_item_find(d->id, d->item),
+                                     "W", NULL, d->item);
+         elm_index_item_insert_before(d->id,
+                                      elm_index_item_find(d->id, d->item),
+                                      "V", NULL, d->item);
          break;
 
-      case INDEX_PREPEND: /* 3 */
+      case INDEX_PREPEND:
          elm_index_item_prepend(d->id, "D", NULL, d->item);
          break;
 
-      case INDEX_ITEM_DEL: /* 4 */
+      case INDEX_ITEM_DEL:
          elm_object_item_del(elm_index_item_find(d->id, d->item));
          break;
 
-      case INDEX_ITEM_FIND: /* 5 */
+      case INDEX_ITEM_FIND:
            {
               Elm_Object_Item *i = elm_index_item_find(d->id, d->item);
               if(i)
@@ -69,7 +76,15 @@ set_api_state(api_data *api)
            }
          break;
 
-      case INDEX_CLEAR: /* 6 */
+      case INDEX_HORIZONTAL:
+         elm_index_horizontal_set(d->id, EINA_TRUE);
+         break;
+
+      case INDEX_INDICATOR_DISABLED:
+         elm_index_indicator_disabled_set(d->id, EINA_TRUE);
+         break;
+
+      case INDEX_CLEAR:
          elm_index_item_clear(d->id);
          break;
 
@@ -113,7 +128,8 @@ _index_delay_changed_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void
 {
    // called on a change but delayed in case multiple changes happen in a
    // short timespan
-   elm_genlist_item_top_bring_in(elm_object_item_data_get(event_info));
+   elm_genlist_item_bring_in(elm_object_item_data_get(event_info),
+                              ELM_GENLIST_ITEM_SCROLLTO_TOP);
 }
 
 void
@@ -127,7 +143,8 @@ void
 _index_selected_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
 {
    // called on final select
-   elm_genlist_item_top_bring_in(elm_object_item_data_get(event_info));
+   elm_genlist_item_bring_in(elm_object_item_data_get(event_info),
+                              ELM_GENLIST_ITEM_SCROLLTO_TOP);
 }
 
 static void
@@ -206,7 +223,6 @@ test_index(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
              snprintf(buf, sizeof(buf), "%c", 'A' + ((j >> 4) & 0xf));
              elm_index_item_append(id, buf, id_cb, glit);
-
              if (*buf == 'G')  /* Just init dt->item later used in API test */
                api->dt.item = glit;
           }
@@ -216,7 +232,6 @@ test_index(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_smart_callback_add(id, "changed", _index_changed_cb, NULL);
    evas_object_smart_callback_add(id, "selected", _index_selected_cb, NULL);
    elm_index_level_go(id, 0);
-
    evas_object_resize(win, 320, 480);
    evas_object_show(win);
 }
@@ -342,10 +357,10 @@ test_index2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    gui->id = elm_index_add(win);
    evas_object_size_hint_weight_set(gui->id, EVAS_HINT_EXPAND,
-        EVAS_HINT_EXPAND);
+                                    EVAS_HINT_EXPAND);
    elm_win_resize_object_add(win, gui->id);
    evas_object_smart_callback_add(gui->id, "delay,changed",
-        test_index2_id_changed, NULL);
+                                  test_index2_id_changed, NULL);
    evas_object_show(gui->id);
 
    gui->entry = elm_entry_add(win);
@@ -368,14 +383,15 @@ test_index2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    gui->lst = elm_list_add(win);
    elm_box_pack_end(box, gui->lst);
    evas_object_size_hint_weight_set(gui->lst, EVAS_HINT_EXPAND,
-        EVAS_HINT_EXPAND);
+                                    EVAS_HINT_EXPAND);
    evas_object_size_hint_fill_set(gui->lst, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_smart_callback_add(gui->lst, "selected", test_index2_it_del,
-        gui);
+                                  gui);
    elm_list_go(gui->lst);
    evas_object_show(gui->lst);
 
    evas_object_resize(win, 320, 480);
    evas_object_show(win);
 }
+
 #endif