diff options
author | Daniel Juyung Seo <seojuyung2@gmail.com> | 2014-01-16 09:34:16 +0900 |
---|---|---|
committer | Daniel Juyung Seo <seojuyung2@gmail.com> | 2014-01-21 19:58:09 +0900 |
commit | fb135d2ca4994cbbb99c3a010dea563b9e807756 (patch) | |
tree | 8ef2122b1d052fd71ec0df18e9cf4527a674d039 | |
parent | 2ab029a41303d45cf24546cfde3048d6a5446f24 (diff) |
test_focus: Call window object show after its content creation.
This is a successor commit of 64fd5a825b24591aedb9cac695d03f5b4d867442.
Window show call triggers all smart objects' smart calculation and in case of
X11, XMapWindow() is called directly.
Also moved resize of window accordingly.
-rw-r--r-- | src/bin/test_focus3.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/bin/test_focus3.c b/src/bin/test_focus3.c index 2ff932d80..de951fe4d 100644 --- a/src/bin/test_focus3.c +++ b/src/bin/test_focus3.c | |||
@@ -56,7 +56,6 @@ test_focus3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in | |||
56 | 56 | ||
57 | win = elm_win_util_standard_add("focus3", "Focus 3"); | 57 | win = elm_win_util_standard_add("focus3", "Focus 3"); |
58 | elm_win_focus_highlight_enabled_set(win, EINA_TRUE); | 58 | elm_win_focus_highlight_enabled_set(win, EINA_TRUE); |
59 | evas_object_resize(win, 320, 480); | ||
60 | elm_win_autodel_set(win, EINA_TRUE); | 59 | elm_win_autodel_set(win, EINA_TRUE); |
61 | 60 | ||
62 | bx = elm_box_add(win); | 61 | bx = elm_box_add(win); |
@@ -102,6 +101,7 @@ test_focus3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in | |||
102 | elm_box_pack_end(bx, bt); | 101 | elm_box_pack_end(bx, bt); |
103 | evas_object_show(bt); | 102 | evas_object_show(bt); |
104 | 103 | ||
104 | evas_object_resize(win, 320, 480); | ||
105 | evas_object_show(win); | 105 | evas_object_show(win); |
106 | } | 106 | } |
107 | 107 | ||
@@ -219,8 +219,6 @@ test_focus4(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in | |||
219 | elm_win_autodel_set(win, EINA_TRUE); | 219 | elm_win_autodel_set(win, EINA_TRUE); |
220 | elm_win_focus_highlight_enabled_set(win, EINA_TRUE); | 220 | elm_win_focus_highlight_enabled_set(win, EINA_TRUE); |
221 | elm_win_focus_highlight_animate_set(win, EINA_TRUE); | 221 | elm_win_focus_highlight_animate_set(win, EINA_TRUE); |
222 | evas_object_resize(win, 320, 320); | ||
223 | evas_object_show(win); | ||
224 | 222 | ||
225 | fr = elm_frame_add(win); | 223 | fr = elm_frame_add(win); |
226 | evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); | 224 | evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); |
@@ -341,6 +339,9 @@ test_focus4(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in | |||
341 | evas_object_smart_callback_add(tg, "changed", custom_chain_unset_cb, bx); | 339 | evas_object_smart_callback_add(tg, "changed", custom_chain_unset_cb, bx); |
342 | elm_box_pack_end(bx, tg); | 340 | elm_box_pack_end(bx, tg); |
343 | evas_object_show(tg); | 341 | evas_object_show(tg); |
342 | |||
343 | evas_object_resize(win, 320, 320); | ||
344 | evas_object_show(win); | ||
344 | } | 345 | } |
345 | 346 | ||
346 | static void | 347 | static void |
@@ -375,8 +376,6 @@ test_focus_custom(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev | |||
375 | elm_win_focus_highlight_enabled_set(win, EINA_TRUE); | 376 | elm_win_focus_highlight_enabled_set(win, EINA_TRUE); |
376 | elm_win_focus_highlight_animate_set(win, EINA_TRUE); | 377 | elm_win_focus_highlight_animate_set(win, EINA_TRUE); |
377 | elm_win_focus_highlight_style_set(win, "glow"); | 378 | elm_win_focus_highlight_style_set(win, "glow"); |
378 | evas_object_resize(win, 320, 320); | ||
379 | evas_object_show(win); | ||
380 | 379 | ||
381 | fr = elm_frame_add(win); | 380 | fr = elm_frame_add(win); |
382 | evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); | 381 | evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); |
@@ -453,4 +452,7 @@ test_focus_custom(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev | |||
453 | evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); | 452 | evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); |
454 | elm_box_pack_end(bx2, bt); | 453 | elm_box_pack_end(bx2, bt); |
455 | evas_object_show(bt); | 454 | evas_object_show(bt); |
455 | |||
456 | evas_object_resize(win, 320, 320); | ||
457 | evas_object_show(win); | ||
456 | } | 458 | } |