Elementary migration revision 70492

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

diff --git a/src/bin/test_tooltip.c b/src/bin/test_tooltip.c
index e46f03c..d82516c 100644 (file)
--- a/src/bin/test_tooltip.c
+++ b/src/bin/test_tooltip.c
@@ -1,12 +1,12 @@
-#include <Elementary.h>
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Elementary.h>
 #ifndef ELM_LIB_QUICKLAUNCH
 
 typedef struct _Testitem
 {
-   Elm_Object_Item  *item;
+   Elm_Object_Item *item;
    const char       *path;
    int               mode;
    int               onoff;
@@ -62,7 +62,7 @@ gltt_exp(void *data       __UNUSED__,
    glit2 = elm_genlist_item_append(gl, &itct, (void *)(long) (val + 2), glit,
                                    ELM_GENLIST_ITEM_NONE, NULL, NULL);
    glit3 = elm_genlist_item_append(gl, &itct, (void *)(long) (val + 3), glit,
-                                   ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL);
+                                   ELM_GENLIST_ITEM_TREE, NULL, NULL);
 
    elm_genlist_item_tooltip_text_set(glit1, "Testing A");
    elm_genlist_item_tooltip_text_set(glit2, "Testing B");
@@ -149,6 +149,7 @@ _tt_item_icon3(void *data   __UNUSED__,
    snprintf(buf, sizeof(buf), "%s/images/insanely_huge_test_image.jpg", elm_app_data_dir_get());
    elm_icon_file_set(ic, buf, NULL);
    elm_icon_size_get(ic, &w, &h);
+   elm_icon_resizable_set(ic, 0, 0);
    elm_win_screen_size_get(tt, NULL, NULL, &sw, &sh);
    if ((w > sw) || (h > sh))
      {
@@ -370,20 +371,13 @@ test_tooltip(void *data       __UNUSED__,
              Evas_Object *obj __UNUSED__,
              void *event_info __UNUSED__)
 {
-   Evas_Object *win, *bg, *bx, *tb, *bt, *se, *lst;
+   Evas_Object *win, *bx, *tb, *bt, *se, *lst;
    Elm_Object_Item *tb_it;
    Elm_Object_Item *lit;
 
-   win = elm_win_add(NULL, "tooltip", ELM_WIN_BASIC);
-   elm_win_title_set(win, "Tooltip");
+   win = elm_win_util_standard_add("tooltip", "Tooltip");
    elm_win_autodel_set(win, EINA_TRUE);
 
-   bg = elm_bg_add(win);
-   elm_win_resize_object_add(win, bg);
-   evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND,
-                                    EVAS_HINT_EXPAND);
-   evas_object_show(bg);
-
    bx = elm_box_add(win);
    evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND,
                                     EVAS_HINT_EXPAND);
@@ -479,7 +473,7 @@ test_tooltip(void *data       __UNUSED__,
    evas_object_size_hint_align_set(se, EVAS_HINT_FILL, 0.5);
    elm_entry_scrollbar_policy_set(se, ELM_SCROLLER_POLICY_OFF,
                                            ELM_SCROLLER_POLICY_OFF);
-   elm_object_text_set(se, "Hello, some scrolled entry here!");
+   elm_object_text_set(se, "Hello, some entry here!");
    elm_object_tooltip_text_set(se, "Type something here!");
    elm_entry_single_line_set(se, EINA_TRUE);
    elm_box_pack_end(bx, se);
@@ -516,7 +510,7 @@ test_tooltip2(void *data       __UNUSED__,
               Evas_Object *obj __UNUSED__,
               void *event_info __UNUSED__)
 {
-   Evas_Object *win, *bg, *bx, *grid, *gl;
+   Evas_Object *win, *bx, *grid, *gl;
    Elm_Object_Item *glit1, *glit2, *glit3;
    static Testitem ti[144];
    int i, n;
@@ -534,16 +528,9 @@ test_tooltip2(void *data       __UNUSED__,
       "wood_01.jpg",
    };
 
-   win = elm_win_add(NULL, "tooltip2", ELM_WIN_BASIC);
-   elm_win_title_set(win, "Tooltip 2");
+   win = elm_win_util_standard_add("tooltip2", "Tooltip 2");
    elm_win_autodel_set(win, EINA_TRUE);
 
-   bg = elm_bg_add(win);
-   evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND,
-                                    EVAS_HINT_EXPAND);
-   elm_win_resize_object_add(win, bg);
-   evas_object_show(bg);
-
    bx = elm_box_add(win);
    evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND,
                                     EVAS_HINT_EXPAND);
@@ -592,9 +579,9 @@ test_tooltip2(void *data       __UNUSED__,
    itct.func.text_get = gltt_text_get;
 
    glit1 = elm_genlist_item_append(gl, &itct, (void *)1, NULL,
-                                   ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL);
+                                   ELM_GENLIST_ITEM_TREE, NULL, NULL);
    glit2 = elm_genlist_item_append(gl, &itct, (void *)2, NULL,
-                                   ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL);
+                                   ELM_GENLIST_ITEM_TREE, NULL, NULL);
    glit3 = elm_genlist_item_append(gl, &itct, (void *)3, NULL,
                                    ELM_GENLIST_ITEM_NONE, NULL, NULL);