use some of the new macros and #defines i put into evas - they will help the

code to be more understandable, bgut i haven't done all of them. there are a
lot. they'll get done over time.

SVN revision: 42756

diff --git a/src/bin/test.c b/src/bin/test.c
index 1ef1e4d..778fe65 100644 (file)
--- a/src/bin/test.c
+++ b/src/bin/test.c
@@ -130,8 +130,8 @@ my_win_main(void)
 
    li = elm_list_add(win);
    elm_list_always_select_mode_set(li, 1);
-   evas_object_size_hint_weight_set(li, 1.0, 1.0);
-   evas_object_size_hint_align_set(li, -1.0, -1.0);
+   evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_fill_set(li, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_box_pack_end(bx0, li);
    evas_object_show(li);
 

diff --git a/src/bin/test_toolbar.c b/src/bin/test_toolbar.c
index 7e0a0cf..14a9f27 100644 (file)
--- a/src/bin/test_toolbar.c
+++ b/src/bin/test_toolbar.c
@@ -52,17 +52,17 @@ test_toolbar(void *data, Evas_Object *obj, void *event_info)
 
    bg = elm_bg_add(win);
    elm_win_resize_object_add(win, bg);
-   evas_object_size_hint_weight_set(bg, 1.0, 1.0);
+   evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_show(bg);
 
    bx = elm_box_add(win);
    elm_win_resize_object_add(win, bx);
-   evas_object_size_hint_weight_set(bx, 1.0, 1.0);
+   evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_show(bx);
 
    tb = elm_toolbar_add(win);
    evas_object_size_hint_weight_set(tb, 0.0, 0.0);
-   evas_object_size_hint_align_set(tb, -1.0, 0.0);
+   evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0);
 
    ph1 = elm_photo_add(win);
    ph2 = elm_photo_add(win);
@@ -100,21 +100,21 @@ test_toolbar(void *data, Evas_Object *obj, void *event_info)
 
    tb = elm_table_add(win);
 //   elm_table_homogenous_set(tb, 1);
-   evas_object_size_hint_weight_set(tb, 0.0, 1.0);
-   evas_object_size_hint_align_set(tb, -1.0, -1.0);
+   evas_object_size_hint_weight_set(tb, 0.0, EVAS_HINT_EXPAND);
+   evas_object_size_hint_fill_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    ph = ph1;
    elm_photo_size_set(ph, 40);
    snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", PACKAGE_DATA_DIR);
    elm_photo_file_set(ph, buf);
-   evas_object_size_hint_weight_set(ph, 1.0, 1.0);
+   evas_object_size_hint_weight_set(ph, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(ph, 0.5, 0.5);
    elm_table_pack(tb, ph, 0, 0, 1, 1);
    evas_object_show(ph);
 
    ph = ph2;
    elm_photo_size_set(ph, 80);
-   evas_object_size_hint_weight_set(ph, 1.0, 1.0);
+   evas_object_size_hint_weight_set(ph, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(ph, 0.5, 0.5);
    elm_table_pack(tb, ph, 1, 0, 1, 1);
    evas_object_show(ph);
@@ -123,7 +123,7 @@ test_toolbar(void *data, Evas_Object *obj, void *event_info)
    elm_photo_size_set(ph, 20);
    snprintf(buf, sizeof(buf), "%s/images/sky_01.jpg", PACKAGE_DATA_DIR);
    elm_photo_file_set(ph, buf);
-   evas_object_size_hint_weight_set(ph, 1.0, 1.0);
+   evas_object_size_hint_weight_set(ph, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(ph, 0.5, 0.5);
    elm_table_pack(tb, ph, 0, 1, 1, 1);
    evas_object_show(ph);
@@ -132,7 +132,7 @@ test_toolbar(void *data, Evas_Object *obj, void *event_info)
    elm_photo_size_set(ph, 60);
    snprintf(buf, sizeof(buf), "%s/images/sky_02.jpg", PACKAGE_DATA_DIR);
    elm_photo_file_set(ph, buf);
-   evas_object_size_hint_weight_set(ph, 1.0, 1.0);
+   evas_object_size_hint_weight_set(ph, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(ph, 0.5, 0.5);
    elm_table_pack(tb, ph, 1, 1, 1, 1);
    evas_object_show(ph);

diff --git a/src/bin/test_win_state.c b/src/bin/test_win_state.c
index e5f7dba..ea54465 100644 (file)
--- a/src/bin/test_win_state.c
+++ b/src/bin/test_win_state.c
@@ -70,34 +70,34 @@ test_win_state(void *data, Evas_Object *obj, void *event_info)
 
    bg = elm_bg_add(win);
    elm_win_resize_object_add(win, bg);
-   evas_object_size_hint_weight_set(bg, 1.0, 1.0);
+   evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_show(bg);
    evas_object_data_set(win, "bg", bg);
 
    bx = elm_box_add(win);
-   evas_object_size_hint_weight_set(bx, 1.0, 1.0);
+   evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_win_resize_object_add(win, bx);
    evas_object_show(bx);
 
    bx2 = elm_box_add(win);
    elm_box_horizontal_set(bx2, 1);
    elm_box_homogenous_set(bx2, 1);
-   evas_object_size_hint_weight_set(bx2, 1.0, 0.0);
-   evas_object_size_hint_align_set(bx2, -1.0, -1.0);
+   evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.0);
+   evas_object_size_hint_fill_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    bt = elm_button_add(win);
    elm_button_label_set(bt, "Alpha On");
    evas_object_smart_callback_add(bt, "clicked", my_bt_38_alpha_on, win);
-   evas_object_size_hint_align_set(bt, -1.0, -1.0);
-   evas_object_size_hint_weight_set(bt, 1.0, 0.0);
+   evas_object_size_hint_fill_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
    elm_box_pack_end(bx2, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
    elm_button_label_set(bt, "Alpha Off");
    evas_object_smart_callback_add(bt, "clicked", my_bt_38_alpha_off, win);
-   evas_object_size_hint_align_set(bt, -1.0, -1.0);
-   evas_object_size_hint_weight_set(bt, 1.0, 0.0);
+   evas_object_size_hint_fill_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
    elm_box_pack_end(bx2, bt);
    evas_object_show(bt);
 
@@ -107,14 +107,14 @@ test_win_state(void *data, Evas_Object *obj, void *event_info)
    bx2 = elm_box_add(win);
    elm_box_horizontal_set(bx2, 1);
    elm_box_homogenous_set(bx2, 1);
-   evas_object_size_hint_weight_set(bx2, 1.0, 1.0);
-   evas_object_size_hint_align_set(bx2, -1.0, -1.0);
+   evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_fill_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    sl = elm_slider_add(win);
    elm_slider_label_set(sl, "Test");
    elm_slider_span_size_set(sl, 100);
    evas_object_size_hint_align_set(sl, 0.5, 0.5);
-   evas_object_size_hint_weight_set(sl, 1.0, 1.0);
+   evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_slider_indicator_format_set(sl, "%3.0f");
    elm_slider_min_max_set(sl, 50, 150);
    elm_slider_value_set(sl, 50);
@@ -128,38 +128,38 @@ test_win_state(void *data, Evas_Object *obj, void *event_info)
    bx2 = elm_box_add(win);
    elm_box_horizontal_set(bx2, 1);
    elm_box_homogenous_set(bx2, 1);
-   evas_object_size_hint_weight_set(bx2, 1.0, 0.0);
-   evas_object_size_hint_align_set(bx2, -1.0, -1.0);
+   evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.0);
+   evas_object_size_hint_fill_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    bt = elm_button_add(win);
    elm_button_label_set(bt, "Rot 0");
    evas_object_smart_callback_add(bt, "clicked", my_bt_38_rot_0, win);
-   evas_object_size_hint_align_set(bt, -1.0, -1.0);
-   evas_object_size_hint_weight_set(bt, 1.0, 0.0);
+   evas_object_size_hint_fill_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
    elm_box_pack_end(bx2, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
    elm_button_label_set(bt, "Rot 90");
    evas_object_smart_callback_add(bt, "clicked", my_bt_38_rot_90, win);
-   evas_object_size_hint_align_set(bt, -1.0, -1.0);
-   evas_object_size_hint_weight_set(bt, 1.0, 0.0);
+   evas_object_size_hint_fill_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
    elm_box_pack_end(bx2, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
    elm_button_label_set(bt, "Rot 180");
    evas_object_smart_callback_add(bt, "clicked", my_bt_38_rot_180, win);
-   evas_object_size_hint_align_set(bt, -1.0, -1.0);
-   evas_object_size_hint_weight_set(bt, 1.0, 0.0);
+   evas_object_size_hint_fill_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
    elm_box_pack_end(bx2, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
    elm_button_label_set(bt, "Rot 270");
    evas_object_smart_callback_add(bt, "clicked", my_bt_38_rot_270, win);
-   evas_object_size_hint_align_set(bt, -1.0, -1.0);
-   evas_object_size_hint_weight_set(bt, 1.0, 0.0);
+   evas_object_size_hint_fill_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
    elm_box_pack_end(bx2, bt);
    evas_object_show(bt);