Sync tests to upstream

diff --git a/src/bin/test_ctxpopup.c b/src/bin/test_ctxpopup.c
index dc4fd10..01189b5 100644 (file)
--- a/src/bin/test_ctxpopup.c
+++ b/src/bin/test_ctxpopup.c
@@ -4,11 +4,44 @@
 #endif
 #ifndef ELM_LIB_QUICKLAUNCH
 
+
+static void
+_dismissed(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+{
+   evas_object_del(obj);
+}
+
+static void
+_print_current_dir(Evas_Object *obj)
+{
+   Elm_Ctxpopup_Direction dir;
+   dir = elm_ctxpopup_direction_get(obj);
+
+   switch(dir)
+     {
+      case ELM_CTXPOPUP_DIRECTION_LEFT:
+         printf("ctxpopup direction: left!\n");
+         break;
+      case ELM_CTXPOPUP_DIRECTION_RIGHT:
+         printf("ctxpopup direction: right!\n");
+         break;
+      case ELM_CTXPOPUP_DIRECTION_UP:
+         printf("ctxpopup direction: up!\n");
+         break;
+      case ELM_CTXPOPUP_DIRECTION_DOWN:
+         printf("ctxpopup direction: down!\n");
+         break;
+      case ELM_CTXPOPUP_DIRECTION_UNKNOWN:
+         printf("ctxpopup direction: unknow!\n");
+         break;
+     }
+}
+
 static void
 _ctxpopup_item_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
 {
    printf("ctxpopup item selected: %s\n",
-          elm_ctxpopup_item_label_get(event_info));
+   elm_object_item_text_get(event_info));
 }
 
 #define ITEM_NEW(_hov, _label, _icon)                                           \
@@ -26,10 +59,14 @@ static void
 _list_item_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Evas_Object *ctxpopup, *ic;
-   Elm_Ctxpopup_Item *it;
+   Elm_Object_Item *it;
    Evas_Coord x,y;
 
    ctxpopup = elm_ctxpopup_add(obj);
+   evas_object_smart_callback_add(ctxpopup,
+                                  "dismissed",
+                                  _dismissed,
+                                  NULL);
 
    ITEM_NEW(ctxpopup, "Go to home folder", "home");
    ITEM_NEW(ctxpopup, "Save file", "file");
@@ -44,16 +81,21 @@ _list_item_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_size_hint_max_set(ctxpopup, 240, 240);
    evas_object_move(ctxpopup, x, y);
    evas_object_show(ctxpopup);
+   _print_current_dir(ctxpopup);
 }
 
 static void
 _list_item_cb2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Evas_Object *ctxpopup, *ic;
-   Elm_Ctxpopup_Item *it;
+   Elm_Object_Item *it;
    Evas_Coord x,y;
 
    ctxpopup = elm_ctxpopup_add(obj);
+   evas_object_smart_callback_add(ctxpopup,
+                                  "dismissed",
+                                  _dismissed,
+                                  NULL);
 
    ITEM_NEW(ctxpopup, NULL, "home");
    ITEM_NEW(ctxpopup, NULL, "file");
@@ -67,16 +109,21 @@ _list_item_cb2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    evas_object_size_hint_max_set(ctxpopup, 240, 240);
    evas_object_move(ctxpopup, x, y);
    evas_object_show(ctxpopup);
+   _print_current_dir(ctxpopup);
 }
 
 static void
 _list_item_cb3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Evas_Object *ctxpopup, *ic;
-   Elm_Ctxpopup_Item *it;
+   Elm_Object_Item *it;
    Evas_Coord x,y;
 
    ctxpopup = elm_ctxpopup_add(obj);
+   evas_object_smart_callback_add(ctxpopup,
+                                  "dismissed",
+                                  _dismissed,
+                                  NULL);
 
    ITEM_NEW(ctxpopup, "Eina", NULL);
    ITEM_NEW(ctxpopup, "Eet", NULL);
@@ -89,16 +136,22 @@ _list_item_cb3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    evas_pointer_canvas_xy_get(evas_object_evas_get(obj), &x, &y);
    evas_object_move(ctxpopup, x, y);
    evas_object_show(ctxpopup);
+   _print_current_dir(ctxpopup);
 }
 
 static void
 _list_item_cb4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Evas_Object *ctxpopup, *ic;
-   Elm_Ctxpopup_Item *it;
+   Elm_Object_Item *it;
    Evas_Coord x,y;
 
    ctxpopup = elm_ctxpopup_add(obj);
+   evas_object_smart_callback_add(ctxpopup,
+                                  "dismissed",
+                                  _dismissed,
+                                  NULL);
+
    elm_ctxpopup_horizontal_set(ctxpopup, EINA_TRUE);
 
    ITEM_NEW(ctxpopup, NULL, "home");
@@ -112,6 +165,7 @@ _list_item_cb4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    evas_object_size_hint_max_set(ctxpopup, 240, 240);
    evas_object_move(ctxpopup, x, y);
    evas_object_show(ctxpopup);
+   _print_current_dir(ctxpopup);
 }
 
 
@@ -139,11 +193,17 @@ _list_item_cb5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    elm_box_pack_end(bx, sc);
 
    ctxpopup = elm_ctxpopup_add(obj);
+   evas_object_smart_callback_add(ctxpopup,
+                                  "dismissed",
+                                  _dismissed,
+                                  NULL);
+
    elm_object_content_set(ctxpopup, bx);
 
    evas_pointer_canvas_xy_get(evas_object_evas_get(obj), &x, &y);
    evas_object_move(ctxpopup, x, y);
    evas_object_show(ctxpopup);
+   _print_current_dir(ctxpopup);
 }
 
 
@@ -168,6 +228,7 @@ test_ctxpopup(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    list = elm_list_add(win);
    elm_win_resize_object_add(win, list);
+   evas_object_size_hint_weight_set(list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_list_mode_set(list, ELM_LIST_COMPRESS);
    evas_object_smart_callback_add(list, "selected", _list_clicked, NULL);
 

diff --git a/src/bin/test_segment_control.c b/src/bin/test_segment_control.c
index 32dfd47..aadf070 100644 (file)
--- a/src/bin/test_segment_control.c
+++ b/src/bin/test_segment_control.c
@@ -8,7 +8,7 @@ void
 test_segment_control(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Evas_Object *win, *bg, *ic, *ic1, *ic2, *ic3, *ic4, *ic5;
-   Elm_Segment_Item *it1, *it2, *it3, *it4, *it5;
+   Elm_Segment_Item *it;
 
    Evas_Object * in_layout;
    Evas_Object *segment1, *segment2, *segment3, *segment4;
@@ -46,19 +46,19 @@ test_segment_control(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *e
    evas_object_size_hint_aspect_set(ic1, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
 
    segment1 = elm_segment_control_add(win);
-   it1 = elm_segment_control_item_add(segment1, NULL, "Only Text");
-   it2 = elm_segment_control_item_add(segment1, ic, NULL);
-   elm_segment_control_item_selected_set(it2, EINA_TRUE);
-   it3 = elm_segment_control_item_add(segment1, ic1, "Text_Icon_test");
-   it4 = elm_segment_control_item_add(segment1, NULL, "Seg4");
-   it5 = elm_segment_control_item_add(segment1, NULL, "Seg5");
+   elm_segment_control_item_add(segment1, NULL, "Only Text");
+   it = elm_segment_control_item_add(segment1, ic, NULL);
+   elm_segment_control_item_selected_set(it, EINA_TRUE);
+   elm_segment_control_item_add(segment1, ic1, "Text_Icon_test");
+   elm_segment_control_item_add(segment1, NULL, "Seg4");
+   elm_segment_control_item_add(segment1, NULL, "Seg5");
 
    segment2 = elm_segment_control_add(win);
-   it1 = elm_segment_control_item_add(segment2, NULL, "SegmentItem");
-   it2 = elm_segment_control_item_add(segment2, NULL, "SegmentItem");
-   elm_segment_control_item_selected_set(it2, EINA_TRUE);
-   it3 = elm_segment_control_item_add(segment2, NULL, "SegmentControlItem");
-   it4 = elm_segment_control_item_add(segment2, NULL, "SegmentItem");
+   elm_segment_control_item_add(segment2, NULL, "SegmentItem");
+   it = elm_segment_control_item_add(segment2, NULL, "SegmentItem");
+   elm_segment_control_item_selected_set(it, EINA_TRUE);
+   elm_segment_control_item_add(segment2, NULL, "SegmentControlItem");
+   elm_segment_control_item_add(segment2, NULL, "SegmentItem");
 
    ic2 = elm_icon_add(in_layout);
    snprintf(buf3, sizeof(buf3), "%s/images/logo.png", elm_app_data_dir_get());
@@ -76,10 +76,10 @@ test_segment_control(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *e
    evas_object_size_hint_aspect_set(ic4, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
 
    segment3 = elm_segment_control_add(win);
-   it1 = elm_segment_control_item_add(segment3, ic2, NULL);
-   it2 = elm_segment_control_item_add(segment3, ic3, NULL);
-   elm_segment_control_item_selected_set(it2, EINA_TRUE);
-   it3 = elm_segment_control_item_add(segment3, ic4, NULL);
+   elm_segment_control_item_add(segment3, ic2, NULL);
+   it = elm_segment_control_item_add(segment3, ic3, NULL);
+   elm_segment_control_item_selected_set(it, EINA_TRUE);
+   elm_segment_control_item_add(segment3, ic4, NULL);
 
    ic5 = elm_icon_add(in_layout);
    snprintf(buf6, sizeof(buf6), "%s/images/logo.png", elm_app_data_dir_get());
@@ -87,10 +87,10 @@ test_segment_control(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *e
    evas_object_size_hint_aspect_set(ic5, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
 
    segment4 = elm_segment_control_add(win);
-   it1 = elm_segment_control_item_add(segment4, NULL, "Disabled");
-   it2 = elm_segment_control_item_add(segment4, ic5, "Disabled");
-   elm_segment_control_item_selected_set(it2, EINA_TRUE);
-   it3 = elm_segment_control_item_add(segment4, NULL, "Disabled");
+   elm_segment_control_item_add(segment4, NULL, "Disabled");
+   it = elm_segment_control_item_add(segment4, ic5, "Disabled");
+   elm_segment_control_item_selected_set(it, EINA_TRUE);
+   elm_segment_control_item_add(segment4, NULL, "Disabled");
    elm_object_disabled_set(segment4, EINA_TRUE);
 
    elm_object_part_content_set(in_layout, "segment1", segment1);

diff --git a/src/bin/test_tooltip.c b/src/bin/test_tooltip.c
index d5acd7d..e66743b 100644 (file)
--- a/src/bin/test_tooltip.c
+++ b/src/bin/test_tooltip.c
@@ -475,11 +475,17 @@ test_tooltip(void *data       __UNUSED__,
 
    lst = elm_list_add(win);
    li = elm_list_item_append(lst, "Hello", NULL, NULL, NULL, NULL);
-   elm_list_item_tooltip_text_set(li, "Something useful here?");
+   elm_list_item_tooltip_content_cb_set(li, _tt_item_label, NULL, NULL);
+   elm_list_item_tooltip_size_restrict_disable(li, EINA_TRUE);
    li = elm_list_item_append(lst, "Icon Tooltip", NULL, NULL, NULL, NULL);
    elm_list_item_tooltip_content_cb_set(li, _tt_item_icon, NULL, NULL);
    li = elm_list_item_append(lst, "Big Icon Tooltip", NULL, NULL, NULL, NULL);
    elm_list_item_tooltip_content_cb_set(li, _tt_item_icon2, NULL, NULL);
+   elm_list_item_tooltip_style_set(li, "transparent");
+   elm_list_item_tooltip_size_restrict_disable(li, EINA_TRUE);
+   li = elm_list_item_append(lst, "Insanely Big Icon Tooltip", NULL, NULL, NULL, NULL);
+   elm_list_item_tooltip_content_cb_set(li, _tt_item_icon3, NULL, NULL);
+   elm_list_item_tooltip_style_set(li, "transparent");
    elm_list_item_tooltip_size_restrict_disable(li, EINA_TRUE);
    evas_object_size_hint_weight_set(lst, EVAS_HINT_EXPAND,
                                     EVAS_HINT_EXPAND);