test_icon.c: internal refactoring of test_icon example.

Now it looks like a normal efl app.
- Declare variables at the start of the function.
- Resize and show the window right after its creation.
- Set widgets' parents properly.
This commit is contained in:
Daniel Juyung Seo 2013-11-26 23:44:27 +09:00
parent 5ccc0bbad2
commit 10d68b4c57
1 changed files with 12 additions and 13 deletions

View File

@ -54,34 +54,36 @@ bt_clicked(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf
void void
test_icon(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) test_icon(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{ {
Evas_Object *win, *box, *hbox, *tg, *bt; Evas_Object *win, *box, *ic, *hbox, *tg, *bt;
win = elm_win_util_standard_add("icon test", "Icon Test"); char buf[PATH_MAX];
win = elm_win_util_standard_add("icon-test", "Icon Test");
elm_win_autodel_set(win, EINA_TRUE); elm_win_autodel_set(win, EINA_TRUE);
evas_object_resize(win, 400, 400);
evas_object_show(win);
box = elm_box_add(win); box = elm_box_add(win);
evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, box); elm_win_resize_object_add(win, box);
evas_object_show(box); evas_object_show(box);
Evas_Object *ic = elm_icon_add(win); ic = elm_icon_add(box);
char buf[PATH_MAX];
snprintf(buf, sizeof(buf), "%s/images/logo.png", elm_app_data_dir_get()); snprintf(buf, sizeof(buf), "%s/images/logo.png", elm_app_data_dir_get());
elm_image_file_set(ic, buf, NULL); elm_image_file_set(ic, buf, NULL);
elm_image_resizable_set(ic, EINA_TRUE, EINA_TRUE); elm_image_resizable_set(ic, EINA_TRUE, EINA_TRUE);
evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(ic, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_align_set(ic, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_pack_end(box, ic); elm_box_pack_end(box, ic);
evas_object_show(ic); evas_object_show(ic);
hbox = elm_box_add(win); hbox = elm_box_add(box);
elm_box_horizontal_set(hbox, EINA_TRUE); elm_box_horizontal_set(hbox, EINA_TRUE);
evas_object_size_hint_weight_set(hbox, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_weight_set(hbox, EVAS_HINT_EXPAND, 0.0);
elm_box_pack_end(box, hbox); elm_box_pack_end(box, hbox);
evas_object_show(hbox); evas_object_show(hbox);
/* Test Aspect Fixed */ /* Test Aspect Fixed */
tg = elm_check_add(win); tg = elm_check_add(hbox);
elm_object_text_set(tg, "Aspect Fixed"); elm_object_text_set(tg, "Aspect Fixed");
elm_check_state_set(tg, EINA_TRUE); elm_check_state_set(tg, EINA_TRUE);
evas_object_smart_callback_add(tg, "changed", aspect_fixed_cb, ic); evas_object_smart_callback_add(tg, "changed", aspect_fixed_cb, ic);
@ -89,14 +91,14 @@ test_icon(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info
evas_object_show(tg); evas_object_show(tg);
/* Test Fill Outside */ /* Test Fill Outside */
tg = elm_check_add(win); tg = elm_check_add(hbox);
elm_object_text_set(tg, "Fill Outside"); elm_object_text_set(tg, "Fill Outside");
evas_object_smart_callback_add(tg, "changed", fill_outside_cb, ic); evas_object_smart_callback_add(tg, "changed", fill_outside_cb, ic);
elm_box_pack_end(hbox, tg); elm_box_pack_end(hbox, tg);
evas_object_show(tg); evas_object_show(tg);
/* Test Smooth */ /* Test Smooth */
tg = elm_check_add(win); tg = elm_check_add(hbox);
elm_object_text_set(tg, "Smooth"); elm_object_text_set(tg, "Smooth");
elm_check_state_set(tg, EINA_TRUE); elm_check_state_set(tg, EINA_TRUE);
evas_object_smart_callback_add(tg, "changed", smooth_cb, ic); evas_object_smart_callback_add(tg, "changed", smooth_cb, ic);
@ -104,14 +106,11 @@ test_icon(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info
evas_object_show(tg); evas_object_show(tg);
/* Test Preload, Prescale */ /* Test Preload, Prescale */
bt = elm_button_add(win); bt = elm_button_add(hbox);
elm_object_text_set(bt, "Preload & Prescale"); elm_object_text_set(bt, "Preload & Prescale");
evas_object_smart_callback_add(bt, "clicked", bt_clicked, NULL); evas_object_smart_callback_add(bt, "clicked", bt_clicked, NULL);
elm_box_pack_end(hbox, bt); elm_box_pack_end(hbox, bt);
evas_object_show(bt); evas_object_show(bt);
evas_object_resize(win, 400, 400);
evas_object_show(win);
} }
static void static void