Sync with upstream

diff --git a/src/bin/test_button.c b/src/bin/test_button.c
index 4250af3..ed70fee 100644 (file)
--- a/src/bin/test_button.c
+++ b/src/bin/test_button.c
@@ -160,6 +160,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    elm_icon_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
    bt = elm_button_add(win);
+   elm_object_access_info_set(bt, "This is some custom text describing this widget");
    elm_object_style_set(bt, "anchor");
    elm_object_part_content_set(bt, "icon", ic);
    elm_object_disabled_set(bt, 1);

diff --git a/src/bin/test_check.c b/src/bin/test_check.c
index 79bbfba..f0d8840 100644 (file)
--- a/src/bin/test_check.c
+++ b/src/bin/test_check.c
@@ -3,10 +3,19 @@
 # include "elementary_config.h"
 #endif
 #ifndef ELM_LIB_QUICKLAUNCH
+static void
+changed_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
+{
+   Evas_Object *ck2 = data;
+   printf("ck %p to %i\n", obj, elm_check_state_get(obj));
+   elm_check_state_set(ck2, elm_check_state_get(obj));
+   printf("ck2 %p is now %i\n", ck2, elm_check_state_get(ck2));
+}
+
 void
 test_check(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   Evas_Object *win, *bg, *bx, *ic, *ck;
+   Evas_Object *win, *bg, *bx, *ic, *ck, *ck0;
    char buf[PATH_MAX];
 
    win = elm_win_add(NULL, "checks", ELM_WIN_BASIC);
@@ -36,6 +45,8 @@ test_check(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    elm_box_pack_end(bx, ck);
    evas_object_show(ck);
    evas_object_show(ic);
+   
+   ck0 = ck;
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
@@ -47,7 +58,9 @@ test_check(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    elm_box_pack_end(bx, ck);
    evas_object_show(ck);
    evas_object_show(ic);
-
+   
+   evas_object_smart_callback_add(ck, "changed", changed_cb, ck0);
+   
    ck = elm_check_add(win);
    elm_object_text_set(ck, "Label Only");
    elm_box_pack_end(bx, ck);

diff --git a/src/bin/test_fileselector_button.c b/src/bin/test_fileselector_button.c
index 8bf50d3..9077565 100644 (file)
--- a/src/bin/test_fileselector_button.c
+++ b/src/bin/test_fileselector_button.c
@@ -104,27 +104,32 @@ test_fileselector_button(void *data       __UNUSED__,
    elm_box_pack_end(vbox, hbox);
    evas_object_show(hbox);
 
-   bt = elm_button_add(win);
-   elm_object_text_set(bt, "Toggle current selection text entry");
-   evas_object_smart_callback_add(bt, "clicked", _current_sel_toggle, fs_bt);
+   bt = elm_check_add(win);
+   elm_object_style_set(bt, "toggle");
+   elm_object_text_set(bt, "current selection text entry");
+   evas_object_smart_callback_add(bt, "changed", _current_sel_toggle, fs_bt);
    elm_box_pack_end(hbox, bt);
    evas_object_show(bt);
 
-   bt = elm_button_add(win);
-   elm_object_text_set(bt, "Toggle inwin mode");
-   evas_object_smart_callback_add(bt, "clicked", _inwin_mode_toggle, fs_bt);
+   bt = elm_check_add(win);
+   elm_object_style_set(bt, "toggle");
+   elm_object_text_set(bt, "Inwin mode");
+   elm_check_state_set (bt, EINA_TRUE);
+   evas_object_smart_callback_add(bt, "changed", _inwin_mode_toggle, fs_bt);
    elm_box_pack_end(hbox, bt);
    evas_object_show(bt);
 
-   bt = elm_button_add(win);
-   elm_object_text_set(bt, "Toggle folder only mode");
-   evas_object_smart_callback_add(bt, "clicked", _folder_only_toggle, fs_bt);
+   bt = elm_check_add(win);
+   elm_object_style_set(bt, "toggle");
+   elm_object_text_set(bt, "Folder only mode");
+   evas_object_smart_callback_add(bt, "changed", _folder_only_toggle, fs_bt);
    elm_box_pack_end(hbox, bt);
    evas_object_show(bt);
 
-   bt = elm_button_add(win);
-   elm_object_text_set(bt, "Toggle expandable mode");
-   evas_object_smart_callback_add(bt, "clicked", _expandable_toggle, fs_bt);
+   bt = elm_check_add(win);
+   elm_object_style_set(bt, "toggle");
+   elm_object_text_set(bt, "Expandable mode");
+   evas_object_smart_callback_add(bt, "changed", _expandable_toggle, fs_bt);
    elm_box_pack_end(hbox, bt);
    evas_object_show(bt);
 

diff --git a/src/bin/test_flip_page.c b/src/bin/test_flip_page.c
index 00a6180..5537ea1 100644 (file)
--- a/src/bin/test_flip_page.c
+++ b/src/bin/test_flip_page.c
@@ -318,7 +318,6 @@ _state_update(State *st)
    double b, minv = 0.0, minva, mgrad;
    int gx, gy, gszw, gszh, gw, gh, col, row, nw, nh;
    double rho, A, theta, perc, percm, n, rhol, Al, thetal;
-   Vertex2 *tvi;
    Vertex3 *tvo, *tvol;
 
    st->backflip = 0;
@@ -447,6 +446,8 @@ _state_update(State *st)
 
    nw = 16;
    nh = 16;
+   if (nw < 1) nw = 1;
+   if (nh < 1) nh = 1;
    gszw = w / nw;
    gszh = h / nh;
    if (gszw < 4) gszw = 4;
@@ -472,7 +473,6 @@ _state_update(State *st)
 
    num = (st->slices_w + 1) * (st->slices_h + 1);
 
-   tvi = alloca(sizeof(Vertex2) * num);
    tvo = alloca(sizeof(Vertex3) * num);
    tvol = alloca(sizeof(Vertex3) * (st->slices_w + 1));
 

diff --git a/src/bin/test_flipselector.c b/src/bin/test_flipselector.c
index a216beb..65a6f26 100644 (file)
--- a/src/bin/test_flipselector.c
+++ b/src/bin/test_flipselector.c
@@ -7,16 +7,16 @@
 void
 _sel_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
 {
-   Elm_Flipselector_Item *it;
+   Elm_Object_Item *it;
 
    it = event_info;
-   printf("label of selected item is: %s\n", elm_flipselector_item_label_get(it));
+   printf("label of selected item is: %s\n", elm_object_item_text_get(it));
 }
 
 void
 _unsel_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   Elm_Flipselector_Item *it;
+   Elm_Object_Item *it;
    Evas_Object *fp = data;
    it = elm_flipselector_selected_item_get(fp);
    elm_flipselector_item_selected_set(it, EINA_FALSE);
@@ -25,7 +25,7 @@ _unsel_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 void
 _third_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   Elm_Flipselector_Item *it;
+   Elm_Object_Item *it;
    Evas_Object *fp = data;
    it = elm_flipselector_first_item_get(fp);
    it = elm_flipselector_item_next_get(it);