1 files changed, 184 insertions, 145 deletions

diff --git a/src/bin/test_gengrid.c b/src/bin/test_gengrid.c
index cfe0e78db..d01f35dfb 100644
--- a/src/bin/test_gengrid.c
+++ b/src/bin/test_gengrid.c
@@ -36,6 +36,13 @@ struct _api_data
 };
 typedef struct _api_data api_data;
 
+struct _Show_Data
+{
+   int winmode;
+   int scrollto;
+};
+typedef struct _Show_Data Show_Data;
+
 enum _api_state
 {
    GRID_ALIGN_SET,
@@ -992,77 +999,47 @@ test_gengrid_item_styles(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
 }
 
 static void
-_bring_in2_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+_rd1_changed_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
 {
-   Evas_Object *win, *grid;
-   static Item_Data id[5000];
-   int i, n;
-   char buf[PATH_MAX];
-
-   win = elm_win_util_standard_add("horz bring_in", "Horz Bring_in");
-   elm_win_autodel_set(win, EINA_TRUE);
-   evas_object_resize(win, 600, 200);
-   evas_object_show(win);
-
-   grid = elm_gengrid_add(win);
-   evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   elm_win_resize_object_add(win, grid);
-   elm_gengrid_item_size_set(grid,
-                             elm_config_scale_get() * 150,
-                             elm_config_scale_get() * 150);
-   elm_gengrid_group_item_size_set(grid,
-                                   elm_config_scale_get() * 31,
-                                   elm_config_scale_get() * 31);
-   elm_gengrid_horizontal_set(grid, EINA_TRUE);
-   elm_gengrid_align_set(grid, 0.4, 0.8);
-
-   gic = elm_gengrid_item_class_new();
-   gic->item_style = "default";
-   gic->func.text_get = grid_text_get;
-   gic->func.content_get = grid_content_get;
-   gic->func.state_get = grid_state_get;
-   gic->func.del = NULL;
-
-   n = 0;
-   for (i = 0; i < 5000; i++)
-     {
-        snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), img[n]);
-        n = (n + 1) % 9;
-        id[i].mode = i;
-        id[i].path = eina_stringshare_add(buf);
-        id[i].item = elm_gengrid_item_append(grid, gic, &(id[i]), grid_sel, NULL);
-        if (i == 2400)
-          elm_gengrid_item_selected_set(id[i].item, EINA_TRUE);
-     }
+   Show_Data *sd = data;
+   sd->winmode = elm_radio_state_value_get(obj);
+}
 
-   elm_gengrid_item_class_free(gic);
-   evas_object_show(grid);
-   elm_gengrid_item_bring_in(id[2400].item, ELM_GENGRID_ITEM_SCROLLTO_IN);
+static void
+_rd2_changed_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
+{
+   Show_Data *sd = data;
+   sd->scrollto = elm_radio_state_value_get(obj);
 }
 
 static void
-_bring_in1_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+_bring_in_clicked_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Evas_Object *win, *grid;
-   static Item_Data id[5000];
+   static Item_Data ti[5000];
    int i, n;
    char buf[PATH_MAX];
 
-   win = elm_win_util_standard_add("vertical bring_in", "Vertical Bring_in");
+   if (!data) return;
+
+   Show_Data *sd = data;
+
+   if (sd->winmode == 0)
+     win = elm_win_util_standard_add("horz bring_in", "Horz Bring_in");
+   else
+     win = elm_win_util_standard_add("vertical bring_in", "Vertical Bring_in");
    elm_win_autodel_set(win, EINA_TRUE);
-   evas_object_resize(win, 600, 400);
-   evas_object_show(win);
 
    grid = elm_gengrid_add(win);
+   elm_gengrid_item_size_set(grid, 150, 150);
+   elm_gengrid_group_item_size_set(grid, 31, 31);
+   if (sd->winmode == 0)
+     elm_gengrid_horizontal_set(grid, EINA_TRUE);
+   else if (sd->winmode == 1)
+     elm_gengrid_horizontal_set(grid, EINA_FALSE);
    evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_win_resize_object_add(win, grid);
-   elm_gengrid_item_size_set(grid,
-                             elm_config_scale_get() * 150,
-                             elm_config_scale_get() * 150);
-   elm_gengrid_group_item_size_set(grid,
-                                   elm_config_scale_get() * 31,
-                                   elm_config_scale_get() * 31);
-   elm_gengrid_align_set(grid, 0.1, 1.0);
+   elm_gengrid_align_set(grid, 0.1, 0.1);
 
    gic = elm_gengrid_item_class_new();
    gic->item_style = "default";
@@ -1076,43 +1053,53 @@ _bring_in1_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
      {
         snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), img[n]);
         n = (n + 1) % 9;
-        id[i].mode = i;
-        id[i].path = eina_stringshare_add(buf);
-        id[i].item = elm_gengrid_item_append(grid, gic, &(id[i]), grid_sel, NULL);
+        ti[i].mode = i;
+        ti[i].path = eina_stringshare_add(buf);
+        ti[i].item = elm_gengrid_item_append(grid, gic, &(ti[i]), grid_sel, NULL);
         if (i == 1430)
-          elm_gengrid_item_selected_set(id[i].item, EINA_TRUE);
+          elm_gengrid_item_selected_set(ti[i].item, EINA_TRUE);
      }
 
    elm_gengrid_item_class_free(gic);
-   elm_gengrid_item_bring_in(id[1430].item, ELM_GENGRID_ITEM_SCROLLTO_IN);
+   elm_gengrid_item_bring_in(ti[1430].item, sd->scrollto);
    evas_object_show(grid);
-}
 
+   if (sd->winmode == 0)
+     evas_object_resize(win, 600, 200);
+   if (sd->winmode == 1)
+     evas_object_resize(win, 600, 400);
+   evas_object_show(win);
+}
 
 static void
-_show2_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+_show_clicked_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Evas_Object *win, *grid;
-   static Item_Data id[10000];
+   static Item_Data ti[10000];
    int i, n;
    char buf[PATH_MAX];
+   double scale = elm_config_scale_get();
+
+   if (!data) return;
 
-   win = elm_win_util_standard_add("horz show", "Horz Show");
+   Show_Data *sd = data;
+
+   if (sd->winmode == 0)
+     win = elm_win_util_standard_add("horz show", "Horz Show");
+   else
+     win = elm_win_util_standard_add("vertical show", "Vertical Show");
    elm_win_autodel_set(win, EINA_TRUE);
-   evas_object_resize(win, 600, 200);
-   evas_object_show(win);
 
    grid = elm_gengrid_add(win);
+   elm_gengrid_item_size_set(grid, 150 * scale, 150 * scale);
+   elm_gengrid_group_item_size_set(grid, 31 * scale, 31 * scale);
+   if (sd->winmode == 0)
+     elm_gengrid_horizontal_set(grid, EINA_TRUE);
+   else if (sd->winmode == 1)
+     elm_gengrid_horizontal_set(grid, EINA_FALSE);
    evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_win_resize_object_add(win, grid);
-   elm_gengrid_item_size_set(grid,
-                             elm_config_scale_get() * 150,
-                             elm_config_scale_get() * 150);
-   elm_gengrid_group_item_size_set(grid,
-                                   elm_config_scale_get() * 31,
-                                   elm_config_scale_get() * 31);
-   elm_gengrid_horizontal_set(grid, EINA_TRUE);
-   elm_gengrid_align_set(grid, 0.3, 0.7);
+   elm_gengrid_align_set(grid, 0.1, 0.1);
 
    gic = elm_gengrid_item_class_new();
    gic->item_style = "default";
@@ -1126,105 +1113,157 @@ _show2_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev
      {
         snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), img[n]);
         n = (n + 1) % 9;
-        id[i].mode = i;
-        id[i].path = eina_stringshare_add(buf);
-        id[i].item = elm_gengrid_item_append(grid, gic, &(id[i]), grid_sel, NULL);
-        if (i == 3333)
-          elm_gengrid_item_selected_set(id[i].item, EINA_TRUE);
+        ti[i].mode = i;
+        ti[i].path = eina_stringshare_add(buf);
+        ti[i].item = elm_gengrid_item_append(grid, gic, &(ti[i]), grid_sel, NULL);
+        if (i == 2579)
+          elm_gengrid_item_selected_set(ti[i].item, EINA_TRUE);
      }
 
    elm_gengrid_item_class_free(gic);
    evas_object_show(grid);
-   elm_gengrid_item_show(id[3333].item, ELM_GENGRID_ITEM_SCROLLTO_IN);
+   elm_gengrid_item_show(ti[2579].item, sd->scrollto);
+
+   if (sd->winmode == 0)
+     evas_object_resize(win, 600, 200);
+   if (sd->winmode == 1)
+     evas_object_resize(win, 600, 600);
+   evas_object_show(win);
 }
 
-static void
-_show1_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+static Evas_Object *
+_window_mode_frame_new(Evas_Object *win, void *data)
 {
-   Evas_Object *win, *grid;
-   static Item_Data id[10000];
-   int i, n;
-   char buf[PATH_MAX];
+   Evas_Object *fr, *bx, *rd, *rdg;
+   Show_Data *sd = data;
 
-   win = elm_win_util_standard_add("vertical show", "Vertical Show");
-   elm_win_autodel_set(win, EINA_TRUE);
-   evas_object_resize(win, 600, 600);
-   evas_object_show(win);
+   fr = elm_frame_add(win);
+   evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_object_text_set(fr, "Direction");
+   evas_object_show(fr);
 
-   grid = elm_gengrid_add(win);
-   evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   elm_win_resize_object_add(win, grid);
-   elm_gengrid_item_size_set(grid,
-                             elm_config_scale_get() * 150,
-                             elm_config_scale_get() * 150);
-   elm_gengrid_group_item_size_set(grid,
-                                   elm_config_scale_get() * 31,
-                                   elm_config_scale_get() * 31);
-   elm_gengrid_align_set(grid, 0.1, 0.3);
+   bx = elm_box_add(win);
+   elm_object_content_set(fr, bx);
+   evas_object_show(bx);
 
-   gic = elm_gengrid_item_class_new();
-   gic->item_style = "default";
-   gic->func.text_get = grid_text_get;
-   gic->func.content_get = grid_content_get;
-   gic->func.state_get = grid_state_get;
-   gic->func.del = NULL;
+   rd = elm_radio_add(win);
+   evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   elm_radio_state_value_set(rd, 0);
+   elm_object_text_set(rd, "horizontal");
+   evas_object_smart_callback_add(rd, "changed", _rd1_changed_cb, sd);
+   evas_object_show(rd);
+   elm_box_pack_end(bx, rd);
+   rdg = rd;
+
+   rd = elm_radio_add(win);
+   evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   elm_radio_state_value_set(rd, 1);
+   elm_object_text_set(rd, "vertical");
+   elm_radio_group_add(rd, rdg);
+   evas_object_smart_callback_add(rd, "changed", _rd1_changed_cb, sd);
+   evas_object_show(rd);
+   elm_box_pack_end(bx, rd);
+
+   return fr;
+}
 
-   n = 0;
-   for (i = 0; i < 10000; i++)
-     {
-        snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), img[n]);
-        n = (n + 1) % 9;
-        id[i].mode = i;
-        id[i].path = eina_stringshare_add(buf);
-        id[i].item = elm_gengrid_item_append(grid, gic, &(id[i]), grid_sel, NULL);
-        if (i == 2579)
-          elm_gengrid_item_selected_set(id[i].item, EINA_TRUE);
-     }
+static Evas_Object *
+_scrollto_mode_frame_new(Evas_Object *win, void *data)
+{
+   Evas_Object *fr, *bx, *rd, *rdg;
+   Show_Data *sd = data;
 
-   elm_gengrid_item_class_free(gic);
-   evas_object_show(grid);
-   elm_gengrid_item_show(id[2579].item, ELM_GENGRID_ITEM_SCROLLTO_IN);
+   fr = elm_frame_add(win);
+   evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_object_text_set(fr, "Scrollto Mode");
+   evas_object_show(fr);
+
+   bx = elm_box_add(win);
+   elm_object_content_set(fr, bx);
+   evas_object_show(bx);
+
+   rd = elm_radio_add(win);
+   evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   elm_radio_state_value_set(rd, 0);
+   elm_object_text_set(rd, "SCROLLTO_NONE");
+   evas_object_smart_callback_add(rd, "changed", _rd2_changed_cb, sd);
+   evas_object_show(rd);
+   elm_box_pack_end(bx, rd);
+   rdg = rd;
+
+   rd = elm_radio_add(win);
+   evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   elm_radio_state_value_set(rd, 1);
+   elm_object_text_set(rd, "SCROLLTO_IN");
+   elm_radio_group_add(rd, rdg);
+   evas_object_smart_callback_add(rd, "changed", _rd2_changed_cb, sd);
+   evas_object_show(rd);
+   elm_box_pack_end(bx, rd);
+
+   rd = elm_radio_add(win);
+   evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   elm_radio_state_value_set(rd, 2);
+   elm_object_text_set(rd, "SCROLLTO_TOP");
+   elm_radio_group_add(rd, rdg);
+   evas_object_smart_callback_add(rd, "changed", _rd2_changed_cb, sd);
+   evas_object_show(rd);
+   elm_box_pack_end(bx, rd);
+
+   rd = elm_radio_add(win);
+   evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   elm_radio_state_value_set(rd, 4);
+   elm_object_text_set(rd, "SCROLLTO_MIDDLE");
+   elm_radio_group_add(rd, rdg);
+   evas_object_smart_callback_add(rd, "changed", _rd2_changed_cb, sd);
+   evas_object_show(rd);
+   elm_box_pack_end(bx, rd);
+
+   return fr;
 }
 
 void
 test_gengrid4(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
-   Evas_Object *win, *bt, *bx;
-   api_data *api = calloc(1, sizeof(api_data));
+   Evas_Object *win, *bt, *bx, *bx2, *fr;
+   Show_Data *sd = calloc(1, sizeof(Show_Data));
 
-   win = elm_win_util_standard_add("gengrid show/scroll_in", "GenGrid Show/Bring_in");
+   win = elm_win_util_standard_add("gengrid-show-bringin", "GenGrid Show/Bring_in");
    elm_win_autodel_set(win, EINA_TRUE);
-   evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
-   evas_object_resize(win, 300, 300);
+   evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, sd);
    evas_object_show(win);
 
    bx = elm_box_add(win);
    evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_win_resize_object_add(win, bx);
-   elm_box_horizontal_set(bx, EINA_TRUE);
    evas_object_show(bx);
 
-   bt = elm_button_add(win);
-   elm_object_text_set(bt, "Vertical Show");
-   evas_object_smart_callback_add(bt, "clicked", _show1_clicked_cb, NULL);
-   elm_box_pack_end(bx, bt);
-   evas_object_show(bt);
+   bx2 = elm_box_add(bx);
+   elm_box_horizontal_set(bx2, EINA_TRUE);
+   elm_box_pack_end(bx, bx2);
+   evas_object_show(bx2);
 
-   bt = elm_button_add(win);
-   elm_object_text_set(bt, "Vertical Bring_in");
-   evas_object_smart_callback_add(bt, "clicked", _bring_in1_clicked_cb, NULL);
-   elm_box_pack_end(bx, bt);
-   evas_object_show(bt);
+   fr = _window_mode_frame_new(bx2, sd);
+   elm_box_pack_end(bx2, fr);
 
-   bt = elm_button_add(win);
-   elm_object_text_set(bt, "Horz Show");
-   evas_object_smart_callback_add(bt, "clicked", _show2_clicked_cb, NULL);
-   elm_box_pack_end(bx, bt);
+   fr = _scrollto_mode_frame_new(bx2, sd);
+   elm_box_pack_end(bx2, fr);
+
+   bx2 = elm_box_add(bx);
+   elm_box_horizontal_set(bx2, EINA_TRUE);
+   elm_box_pack_end(bx, bx2);
+   evas_object_show(bx2);
+
+   bt = elm_button_add(bx2);
+   elm_object_text_set(bt, "Show");
+   evas_object_smart_callback_add(bt, "clicked", _show_clicked_cb, sd);
+   elm_box_pack_end(bx2, bt);
    evas_object_show(bt);
 
-   bt = elm_button_add(win);
-   elm_object_text_set(bt, "Horz Bring_in");
-   evas_object_smart_callback_add(bt, "clicked", _bring_in2_clicked_cb, NULL);
-   elm_box_pack_end(bx, bt);
+   bt = elm_button_add(bx2);
+   elm_object_text_set(bt, "Bring In");
+   evas_object_smart_callback_add(bt, "clicked", _bring_in_clicked_cb, sd);
+   elm_box_pack_end(bx2, bt);
    evas_object_show(bt);
 }