diff options
| author | Vincent Torri <vincent.torri@gmail.com> | 2021-11-25 10:17:45 +0000 |
|---|---|---|
| committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2021-12-04 09:18:47 +0000 |
| commit | 711638c7d255401539078e1534e6bdb75e39803d (patch) | |
| tree | 0526f7d53df48d3bb4d1ba5b6ad1f16a1698bf20 | |
| parent | 981e85f99cdb1c1945d57256f8d1448168610573 (diff) | |
| download | efl-711638c7d255401539078e1534e6bdb75e39803d.tar.gz | |
Elm_tests: resize windows according to elm scale
Summary: On laptop with 4K display, windows are too small, so resize windows according to elm scale
Test Plan: elm_tests
Reviewers: raster
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D12307
93 files changed, 544 insertions, 283 deletions
diff --git a/src/bin/elementary/test.c b/src/bin/elementary/test.c index a317875263..132b5d4ae9 100644 --- a/src/bin/elementary/test.c +++ b/src/bin/elementary/test.c @@ -1370,7 +1370,8 @@ add_tests: } /* set an initial window size */ - evas_object_resize(win, 480 * elm_config_scale_get(), 490 * elm_config_scale_get()); + evas_object_resize(win, 480 * elm_config_scale_get(), + 490 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_3d.c b/src/bin/elementary/test_3d.c index 66292727b9..d9a796ecf3 100644 --- a/src/bin/elementary/test_3d.c +++ b/src/bin/elementary/test_3d.c @@ -327,7 +327,8 @@ test_3d(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info E evas_object_smart_callback_add(sl, "changed", _ch_z0, win); evas_object_show(sl); - evas_object_resize(win, 480, 480); + evas_object_resize(win, 480 * elm_config_scale_get(), + 480 * elm_config_scale_get()); _cube_update(win, cube); evas_object_show(win); } diff --git a/src/bin/elementary/test_access.c b/src/bin/elementary/test_access.c index c3154f695e..46be9debb9 100644 --- a/src/bin/elementary/test_access.c +++ b/src/bin/elementary/test_access.c @@ -219,7 +219,8 @@ test_access(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in elm_genlist_item_class_free(itc1); elm_genlist_item_class_free(itc2); - evas_object_resize(win, 500, 400); + evas_object_resize(win, 500 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } @@ -297,7 +298,8 @@ test_access2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i elm_box_pack_end(bx, ly); } - evas_object_resize(win, 300, 300); + evas_object_resize(win, 300 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(win); } @@ -403,6 +405,7 @@ test_access3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, _key_down_cb, win); - evas_object_resize(win, 300, 300); + evas_object_resize(win, 300 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_actionslider.c b/src/bin/elementary/test_actionslider.c index 62b99e67bd..bf4e428db4 100644 --- a/src/bin/elementary/test_actionslider.c +++ b/src/bin/elementary/test_actionslider.c @@ -204,6 +204,7 @@ test_actionslider(void *data EINA_UNUSED, Evas_Object * obj EINA_UNUSED, void *e evas_object_show(as); elm_box_pack_end(bx, as); - evas_object_resize(win, 320, 400); + evas_object_resize(win, 320 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_anim.c b/src/bin/elementary/test_anim.c index caad01431f..6d9c66be73 100644 --- a/src/bin/elementary/test_anim.c +++ b/src/bin/elementary/test_anim.c @@ -89,7 +89,8 @@ test_anim(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info evas_object_data_set(win, names[(i * 2)], bub); } - evas_object_resize(win, 480, 800); + evas_object_resize(win, 480 * elm_config_scale_get(), + 800 * elm_config_scale_get()); evas_object_show(win); efl_event_callback_add(win, EFL_CANVAS_OBJECT_EVENT_ANIMATOR_TICK, _anim_tick, NULL); diff --git a/src/bin/elementary/test_bg.c b/src/bin/elementary/test_bg.c index c4a0b0b14a..1ac60985b8 100644 --- a/src/bin/elementary/test_bg.c +++ b/src/bin/elementary/test_bg.c @@ -78,14 +78,17 @@ test_bg_plain(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ /* set size hints. a minimum size for the bg. this should propagate back * to the window thus limiting its size based off the bg as the bg is one * of the window's resize objects. */ - evas_object_size_hint_min_set(bg, 160, 160); + evas_object_size_hint_min_set(bg, 160 * elm_config_scale_get(), + 160 * elm_config_scale_get()); /* and set a maximum size. not needed very often. normally used together * with evas_object_size_hint_min_set() at the same size to make a * window not resizable */ - evas_object_size_hint_max_set(bg, 640, 640); + evas_object_size_hint_max_set(bg, 640 * elm_config_scale_get(), + 640 * elm_config_scale_get()); /* and now just resize the window to a size you want. normally widgets * will determine the initial size though */ - evas_object_resize(win, 320, 320); + evas_object_resize(win, 320 * elm_config_scale_get(), + 320 * elm_config_scale_get()); /* and show the window */ evas_object_show(win); } @@ -157,9 +160,12 @@ test_bg_image(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ evas_object_show(hbox); evas_object_show(o_bg); - evas_object_size_hint_min_set(bg, 160, 160); - evas_object_size_hint_max_set(bg, 640, 640); - evas_object_resize(win, 320, 320); + evas_object_size_hint_min_set(bg, 160 * elm_config_scale_get(), + 160 * elm_config_scale_get()); + evas_object_size_hint_max_set(bg, 640 * elm_config_scale_get(), + 640 * elm_config_scale_get()); + evas_object_resize(win, 320 * elm_config_scale_get(), + 320 * elm_config_scale_get()); evas_object_show(win); } @@ -266,9 +272,12 @@ test_bg_options(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even elm_box_pack_end(box, hbox); evas_object_show(hbox); - evas_object_size_hint_min_set(bg, 160, 160); - evas_object_size_hint_max_set(bg, 640, 640); - evas_object_resize(win, 320, 320); + evas_object_size_hint_min_set(bg, 160 * elm_config_scale_get(), + 160 * elm_config_scale_get()); + evas_object_size_hint_max_set(bg, 640 * elm_config_scale_get(), + 640 * elm_config_scale_get()); + evas_object_resize(win, 320 * elm_config_scale_get(), + 320 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_box.c b/src/bin/elementary/test_box.c index 893e96d716..7143b9c7b0 100644 --- a/src/bin/elementary/test_box.c +++ b/src/bin/elementary/test_box.c @@ -553,7 +553,8 @@ test_box_pack(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ elm_box_pack_end(rbox, bt); evas_object_smart_callback_add(bt, "clicked", _unpack_all_btn_cb, lbox); - evas_object_resize(win, 320, 320); + evas_object_resize(win, 320 * elm_config_scale_get(), + 320 * elm_config_scale_get()); evas_object_show(win); } @@ -598,7 +599,8 @@ test_box_homo(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ evas_object_show(rd); evas_object_show(o_bg); - evas_object_resize(win, 320, 320); + evas_object_resize(win, 320 * elm_config_scale_get(), + 320 * elm_config_scale_get()); evas_object_show(win); } @@ -697,7 +699,8 @@ test_box_transition(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void * elm_box_layout_set(bx, evas_object_box_layout_horizontal, NULL, NULL); _test_box_transition_change(tdata); - evas_object_resize(win, 300, 300); + evas_object_resize(win, 300 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(win); } @@ -879,6 +882,7 @@ test_box_align(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, _description_add(bx_out, bdata); _align_box_add(bx_out, bdata); - evas_object_resize(win, 300, 400); + evas_object_resize(win, 300 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_button.c b/src/bin/elementary/test_button.c index 9ebe0a6c42..e9351c15f9 100644 --- a/src/bin/elementary/test_button.c +++ b/src/bin/elementary/test_button.c @@ -266,6 +266,7 @@ test_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in elm_box_pack_end(bx, bt); evas_object_show(bt); - evas_object_resize(win, 320, 480); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_cnp.c b/src/bin/elementary/test_cnp.c index 35de89e93d..a9d0b7f8fa 100644 --- a/src/bin/elementary/test_cnp.c +++ b/src/bin/elementary/test_cnp.c @@ -130,6 +130,7 @@ test_cnp(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info elm_grid_pack(gd, glb, 10, 80, 60, 10); evas_object_show(glb); - evas_object_resize(win, 480, 200); + evas_object_resize(win, 480 * elm_config_scale_get(), + 200 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_code.c b/src/bin/elementary/test_code.c index ca26ca6cd6..857decaa2c 100644 --- a/src/bin/elementary/test_code.c +++ b/src/bin/elementary/test_code.c @@ -12,7 +12,8 @@ static Evas_Object *_test_code_win_create(const char *id, const char *name) elm_win_title_set(win, name); elm_win_autodel_set(win, EINA_TRUE); - evas_object_resize(win, 360 * elm_config_scale_get(), 220 * elm_config_scale_get()); + evas_object_resize(win, 360 * elm_config_scale_get(), + 220 * elm_config_scale_get()); return win; } diff --git a/src/bin/elementary/test_colorclass.c b/src/bin/elementary/test_colorclass.c index 8764065891..fe76921a11 100644 --- a/src/bin/elementary/test_colorclass.c +++ b/src/bin/elementary/test_colorclass.c @@ -19,6 +19,8 @@ test_colorclass(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even evas_object_show(cc); evas_object_show(win); - evas_object_size_hint_min_set(win, 400, 280); - evas_object_resize(win, 400, 280); + evas_object_size_hint_min_set(win, 400 * elm_config_scale_get(), + 280 * elm_config_scale_get()); + evas_object_resize(win, 400 * elm_config_scale_get(), + 280 * elm_config_scale_get()); } diff --git a/src/bin/elementary/test_combobox.c b/src/bin/elementary/test_combobox.c index 62d21d0913..c9ff9bfc55 100644 --- a/src/bin/elementary/test_combobox.c +++ b/src/bin/elementary/test_combobox.c @@ -216,7 +216,8 @@ test_combobox(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, elm_object_content_set(fr, combobox); evas_object_show(combobox); - evas_object_resize(win, 320, 500); + evas_object_resize(win, 320 * elm_config_scale_get(), + 500 * elm_config_scale_get()); evas_object_show(win); elm_genlist_item_class_free(itc); diff --git a/src/bin/elementary/test_config.c b/src/bin/elementary/test_config.c index 243e080b80..94a444adff 100644 --- a/src/bin/elementary/test_config.c +++ b/src/bin/elementary/test_config.c @@ -307,9 +307,12 @@ _inlined_add(Evas_Object *parent) evas_object_data_set(win, "lb", lb); evas_object_move(win, 10, 100); - evas_object_resize(win, 150, 70); + evas_object_resize(win, 150 * elm_config_scale_get(), + 70 * elm_config_scale_get()); evas_object_move(elm_win_inlined_image_object_get(win), 10, 100); - evas_object_resize(elm_win_inlined_image_object_get(win), 150, 70); + evas_object_resize(elm_win_inlined_image_object_get(win), + 150 * elm_config_scale_get(), + 70 * elm_config_scale_get()); evas_object_smart_callback_add(win, "profile,changed", _win_profile_changed_cb, NULL); evas_object_show(win); @@ -350,7 +353,8 @@ _socket_add(const char *name) _inlined_add(win); evas_object_move(win, 0, 0); - evas_object_resize(win, 150, 200); + evas_object_resize(win, 150 * elm_config_scale_get(), + 200 * elm_config_scale_get()); evas_object_smart_callback_add(win, "profile,changed", _win_profile_changed_cb, NULL); evas_object_show(win); @@ -531,7 +535,8 @@ test_config(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) evas_object_show(bx); evas_object_show(sc); - evas_object_resize(win, 400, 500); + evas_object_resize(win, 400 * elm_config_scale_get(), + 500 * elm_config_scale_get()); evas_object_show(win); } @@ -650,6 +655,7 @@ test_config_font_overlay(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, v it = elm_naviframe_item_push(nf, "Font Overlay", NULL, btn, box, NULL); evas_object_data_set(nf, "page1", it); - evas_object_resize(win, 400, 400); + evas_object_resize(win, 400 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_conform.c b/src/bin/elementary/test_conform.c index f850b1c6e9..ad12269a98 100644 --- a/src/bin/elementary/test_conform.c +++ b/src/bin/elementary/test_conform.c @@ -76,7 +76,8 @@ test_conformant(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even elm_object_content_set(conform, bx); evas_object_show(bx); - evas_object_resize(win, 240, 240); + evas_object_resize(win, 240 * elm_config_scale_get(), + 240 * elm_config_scale_get()); evas_object_show(win); } @@ -190,6 +191,7 @@ test_conformant2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve elm_object_content_set(conform, bx); evas_object_show(bx); - evas_object_resize(win, 240, 480); + evas_object_resize(win, 240 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_conform_indicator.c b/src/bin/elementary/test_conform_indicator.c index d7c13b9e7b..07679351c8 100644 --- a/src/bin/elementary/test_conform_indicator.c +++ b/src/bin/elementary/test_conform_indicator.c @@ -171,7 +171,8 @@ _launch_conformant_indicator_window_btn_cb(void *data EINA_UNUSED, evas_object_show(bt); evas_object_smart_callback_add(bt, "clicked", _visible_change_cb, win); - evas_object_resize(win, 400, 600); + evas_object_resize(win, 400 * elm_config_scale_get(), + 600 * elm_config_scale_get()); evas_object_show(win); } @@ -284,7 +285,8 @@ _create_portrait(void) elm_win_borderless_set(win_port, EINA_TRUE); evas_object_move(win_port, 0, 0); - evas_object_resize(win_port, 720, 60); + evas_object_resize(win_port, 720 * elm_config_scale_get(), + 60 * elm_config_scale_get()); _fill_portrait(win_port); @@ -322,7 +324,8 @@ _create_landscape(void) elm_win_borderless_set(win_land, EINA_TRUE); evas_object_move(win_land, 0, 0); - evas_object_resize(win_land, 1280, 60); + evas_object_resize(win_land, 1280 * elm_config_scale_get(), + 60 * elm_config_scale_get()); _fill_landscape(win_land); @@ -379,6 +382,7 @@ test_conformant_indicator(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, evas_object_smart_callback_add(btn, "clicked", _launch_conformant_indicator_window_btn_cb, NULL); - evas_object_resize(win, 200, 200); + evas_object_resize(win, 200 * elm_config_scale_get(), + 200 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_ctxpopup.c b/src/bin/elementary/test_ctxpopup.c index f547f08951..2b95bbe389 100644 --- a/src/bin/elementary/test_ctxpopup.c +++ b/src/bin/elementary/test_ctxpopup.c @@ -563,6 +563,7 @@ test_ctxpopup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ evas_object_show(list); elm_list_go(list); - evas_object_resize(win, 400, 400); + evas_object_resize(win, 400 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_cursor.c b/src/bin/elementary/test_cursor.c index 1e6401abb9..24d4ababe6 100644 --- a/src/bin/elementary/test_cursor.c +++ b/src/bin/elementary/test_cursor.c @@ -181,7 +181,8 @@ test_cursor(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_show(entry); elm_object_cursor_set(entry, ELM_CURSOR_XTERM); - evas_object_resize(win, 320, 480); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } @@ -299,7 +300,8 @@ test_cursor2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i elm_box_pack_end(bx, grid); evas_object_show(grid); - evas_object_resize(win, 320, 480); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } @@ -406,7 +408,8 @@ test_cursor3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i elm_list_go(o); evas_object_show(o); - evas_object_resize(win, 320, 480); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } @@ -468,6 +471,7 @@ test_cursor4(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i elm_box_pack_end(bx, ly); evas_object_show(ly); - evas_object_resize(win, 320, 480); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_dayselector.c b/src/bin/elementary/test_dayselector.c index 16259e32fa..d98d7815c5 100644 --- a/src/bin/elementary/test_dayselector.c +++ b/src/bin/elementary/test_dayselector.c @@ -120,6 +120,7 @@ test_dayselector(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve evas_object_show(dayselector); elm_object_disabled_set(dayselector, EINA_TRUE); - evas_object_resize(win, 350, 150); + evas_object_resize(win, 350 * elm_config_scale_get(), + 150 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_disable.c b/src/bin/elementary/test_disable.c index 3d5c6a8f90..18a41cbc8a 100644 --- a/src/bin/elementary/test_disable.c +++ b/src/bin/elementary/test_disable.c @@ -101,7 +101,8 @@ test_box_disable(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve evas_object_show(bt); evas_object_smart_callback_add(btn[3], "clicked", _disable_cb, bt); - evas_object_resize(win, 300, 300); + evas_object_resize(win, 300 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_diskselector.c b/src/bin/elementary/test_diskselector.c index a6e14f7609..97793d5d42 100644 --- a/src/bin/elementary/test_diskselector.c +++ b/src/bin/elementary/test_diskselector.c @@ -350,6 +350,7 @@ test_diskselector(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev evas_object_show(disk); evas_object_smart_callback_add(disk, "selected", _print_disk_info_cb, NULL); - evas_object_resize(win, 320, 480); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_dnd.c b/src/bin/elementary/test_dnd.c index 604f73f33f..f5c41f4ae0 100644 --- a/src/bin/elementary/test_dnd.c +++ b/src/bin/elementary/test_dnd.c @@ -819,7 +819,8 @@ test_dnd_genlist_default_anim(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUS } } - evas_object_resize(win, 680, 800); + evas_object_resize(win, 680 * elm_config_scale_get(), + 800 * elm_config_scale_get()); evas_object_show(win); } @@ -884,7 +885,8 @@ test_dnd_genlist_user_anim(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, } } - evas_object_resize(win, 680, 800); + evas_object_resize(win, 680 * elm_config_scale_get(), + 800 * elm_config_scale_get()); evas_object_show(win); } @@ -971,7 +973,8 @@ test_dnd_genlist_gengrid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, v evas_object_show(grid); } - evas_object_resize(win, 680, 800); + evas_object_resize(win, 680 * elm_config_scale_get(), + 800 * elm_config_scale_get()); evas_object_show(win); } @@ -1163,7 +1166,8 @@ test_dnd_multi_features(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, vo evas_object_show(bt); evas_object_show(ic); } - evas_object_resize(win, 680, 800); + evas_object_resize(win, 680 * elm_config_scale_get(), + 800 * elm_config_scale_get()); evas_object_show(win); } @@ -1381,5 +1385,6 @@ test_dnd_types(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event } evas_object_show(win); - evas_object_resize(win, 400, 400); + evas_object_resize(win, 400 * elm_config_scale_get(), + 400 * elm_config_scale_get()); } diff --git a/src/bin/elementary/test_efl_anim_alpha.c b/src/bin/elementary/test_efl_anim_alpha.c index 3c5f62ca64..88acadfa68 100644 --- a/src/bin/elementary/test_efl_anim_alpha.c +++ b/src/bin/elementary/test_efl_anim_alpha.c @@ -116,6 +116,7 @@ test_efl_anim_alpha(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void * evas_object_move(btn2, 100, 300); evas_object_show(btn2); - evas_object_resize(win, 400, 400); + evas_object_resize(win, 400 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_efl_anim_group_parallel.c b/src/bin/elementary/test_efl_anim_group_parallel.c index d560023f2c..97cd2d9970 100644 --- a/src/bin/elementary/test_efl_anim_group_parallel.c +++ b/src/bin/elementary/test_efl_anim_group_parallel.c @@ -125,6 +125,7 @@ test_efl_anim_group_parallel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE evas_object_move(btn2, 50, 300); evas_object_show(btn2); - evas_object_resize(win, 400, 400); + evas_object_resize(win, 400 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_efl_anim_group_sequential.c b/src/bin/elementary/test_efl_anim_group_sequential.c index 62b00a669e..5639c6bb0e 100644 --- a/src/bin/elementary/test_efl_anim_group_sequential.c +++ b/src/bin/elementary/test_efl_anim_group_sequential.c @@ -125,6 +125,7 @@ test_efl_anim_group_sequential(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU evas_object_move(btn2, 50, 300); evas_object_show(btn2); - evas_object_resize(win, 400, 400); + evas_object_resize(win, 400 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_eio.c b/src/bin/elementary/test_eio.c index 51118b7f17..22e51679a2 100644 --- a/src/bin/elementary/test_eio.c +++ b/src/bin/elementary/test_eio.c @@ -240,6 +240,7 @@ test_eio(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info evas_object_smart_callback_add(fs_bt, "file,chosen", _file_chosen, gl); - evas_object_resize(win, 300, 500); + evas_object_resize(win, 300 * elm_config_scale_get(), + 500 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_entry.c b/src/bin/elementary/test_entry.c index 56264ccde7..b6437e8abd 100644 --- a/src/bin/elementary/test_entry.c +++ b/src/bin/elementary/test_entry.c @@ -740,7 +740,8 @@ test_entry_scrolled(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void * evas_object_show(bx3); elm_object_focus_set(win, EINA_TRUE); - evas_object_resize(win, 320, 500); + evas_object_resize(win, 320 * elm_config_scale_get(), + 500 * elm_config_scale_get()); evas_object_show(win); } @@ -872,7 +873,8 @@ test_entry_on_page_scroll(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, elm_box_pack_end(bx, ly); evas_object_show(ly); - evas_object_resize(win, 400, 550); + evas_object_resize(win, 400 * elm_config_scale_get(), + 550 * elm_config_scale_get()); evas_object_show(win); } @@ -1172,7 +1174,8 @@ test_entry_style_user(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void elm_object_focus_allow_set(bt2, EINA_FALSE); evas_object_show(bt2); - evas_object_resize(win, 300, 300); + evas_object_resize(win, 300 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(win); } @@ -1269,7 +1272,6 @@ test_entry_style_default(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, v win = elm_win_util_standard_add("entry-style", "Entry Default Style"); elm_win_autodel_set(win, EINA_TRUE); - evas_object_resize(win, 400, 400); bx = elm_box_add(win); evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -1319,6 +1321,8 @@ test_entry_style_default(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, v elm_box_pack_end(vbx, o); evas_object_show(o); + evas_object_resize(win, 400 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } @@ -1819,9 +1823,9 @@ test_entry3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in elm_box_pack_end(bx, bx2); evas_object_show(bx2); - evas_object_resize(win, 320, 480); - elm_object_focus_set(win, EINA_TRUE); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } @@ -2147,9 +2151,9 @@ test_entry5(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in elm_box_pack_end(bx, bx2); evas_object_show(bx2); - evas_object_resize(win, 320, 480); - elm_object_focus_set(win, EINA_TRUE); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } @@ -2191,9 +2195,9 @@ test_entry6(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in elm_box_pack_end(bx, en); evas_object_show(en); - evas_object_resize(win, 320, 300); - elm_object_focus_set(win, EINA_TRUE); + evas_object_resize(win, 320 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(win); } @@ -2422,7 +2426,8 @@ test_entry7(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_smart_callback_add(bt, "clicked", remove_bt_clicked, en2); evas_object_show(bt); - evas_object_resize(win, 320, 320); + evas_object_resize(win, 320 * elm_config_scale_get(), + 320 * elm_config_scale_get()); evas_object_show(win); } @@ -2636,7 +2641,8 @@ test_entry8(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in elm_grid_pack(gd, ch, 50, 85, 45, 10); evas_object_show(ch); - evas_object_resize(win, 320, 320); + evas_object_resize(win, 320 * elm_config_scale_get(), + 320 * elm_config_scale_get()); evas_object_show(win); } @@ -2798,7 +2804,8 @@ test_entry_regex(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve efl_event_callback_add(test_data->en_single, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re); efl_event_callback_add(test_data->en_multi, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re); - evas_object_resize(win, 400, 400); + evas_object_resize(win, 400 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); #undef REGEX @@ -2882,7 +2889,8 @@ test_entry_notepad(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e elm_box_pack_end(bx, bx2); evas_object_show(bx2); - evas_object_resize(win, 320, 300); + evas_object_resize(win, 320 * elm_config_scale_get(), + 300 * elm_config_scale_get()); elm_object_focus_set(win, EINA_TRUE); evas_object_show(win); @@ -2943,7 +2951,8 @@ test_entry_emoticon(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, evas_object_show(en); elm_object_focus_set(en, EINA_TRUE); - evas_object_resize(win, 400, 500); + evas_object_resize(win, 400 * elm_config_scale_get(), + 500 * elm_config_scale_get()); evas_object_show(win); } @@ -3007,7 +3016,8 @@ test_entry_password(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void * elm_box_pack_end(bx, ck); evas_object_show(ck); - evas_object_resize(win, 300, 100); + evas_object_resize(win, 300 * elm_config_scale_get(), + 100 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_entry_anchor.c b/src/bin/elementary/test_entry_anchor.c index c5210b899d..38aa0adfea 100644 --- a/src/bin/elementary/test_entry_anchor.c +++ b/src/bin/elementary/test_entry_anchor.c @@ -231,6 +231,7 @@ test_entry_anchor(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev evas_object_show(sc); elm_object_focus_set(win, EINA_TRUE); - evas_object_resize(win, 320, 300); + evas_object_resize(win, 320 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_entry_anchor2.c b/src/bin/elementary/test_entry_anchor2.c index a96bdf9ece..0f5047c5a2 100644 --- a/src/bin/elementary/test_entry_anchor2.c +++ b/src/bin/elementary/test_entry_anchor2.c @@ -102,8 +102,8 @@ test_entry_anchor2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e elm_win_resize_object_add(win, en); evas_object_show(en); - evas_object_resize(win, 320, 300); - elm_object_focus_set(win, EINA_TRUE); + evas_object_resize(win, 320 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_external.c b/src/bin/elementary/test_external.c index 2bb55a0bae..96caa410f8 100644 --- a/src/bin/elementary/test_external.c +++ b/src/bin/elementary/test_external.c @@ -20,7 +20,8 @@ test_external_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void elm_win_resize_object_add(win, ly); evas_object_show(ly); - evas_object_resize(win, 320, 400); + evas_object_resize(win, 320 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } @@ -40,7 +41,8 @@ test_external_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void elm_win_resize_object_add(win, ly); evas_object_show(ly); - evas_object_resize(win, 320, 400); + evas_object_resize(win, 320 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } @@ -60,7 +62,8 @@ test_external_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, voi elm_win_resize_object_add(win, ly); evas_object_show(ly); - evas_object_resize(win, 320, 400); + evas_object_resize(win, 320 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } @@ -203,7 +206,8 @@ test_external_pbar(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e bt = edje_object_part_external_object_get(edje, "ext_button3"); evas_object_smart_callback_add(bt, "clicked", _bt_clicked, edje); - evas_object_resize(win, 320, 400); + evas_object_resize(win, 320 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } @@ -223,7 +227,8 @@ test_external_video(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void * elm_win_resize_object_add(win, ly); evas_object_show(ly); - evas_object_resize(win, 320, 400); + evas_object_resize(win, 320 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } @@ -245,7 +250,8 @@ test_external_icon(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e elm_layout_signal_emit(ly, "elm_test,animations,start", "elm_test"); - evas_object_resize(win, 320, 400); + evas_object_resize(win, 320 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } @@ -320,6 +326,7 @@ test_external_combobox(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, voi elm_genlist_item_class_free(itc); - evas_object_resize(win, 320, 400); + evas_object_resize(win, 320 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_factory.c b/src/bin/elementary/test_factory.c index 71ca204023..b13169582a 100644 --- a/src/bin/elementary/test_factory.c +++ b/src/bin/elementary/test_factory.c @@ -176,6 +176,7 @@ test_factory(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i evas_object_show(sc); - evas_object_resize(win, 320, 480); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_fileselector.c b/src/bin/elementary/test_fileselector.c index 880162e9d2..51c76278fb 100644 --- a/src/bin/elementary/test_fileselector.c +++ b/src/bin/elementary/test_fileselector.c @@ -607,6 +607,7 @@ test_fileselector(void *data EINA_UNUSED, elm_box_pack_end(vbox, _sort_option_create(win, vbox, fs)); elm_box_pack_end(vbox, _thumbnail_size_option_create(vbox, fs)); - evas_object_resize(win, 550, 500); + evas_object_resize(win, 550 * elm_config_scale_get(), + 500 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_fileselector_button.c b/src/bin/elementary/test_fileselector_button.c index e3410bf92b..553953157f 100644 --- a/src/bin/elementary/test_fileselector_button.c +++ b/src/bin/elementary/test_fileselector_button.c @@ -248,6 +248,7 @@ test_fileselector_button(void *data EINA_UNUSED, elm_box_pack_end(vbox, en); evas_object_show(en); - evas_object_resize(win, 400, 400); + evas_object_resize(win, 400 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_fileselector_entry.c b/src/bin/elementary/test_fileselector_entry.c index 17d6ddee4b..bf7be459c4 100644 --- a/src/bin/elementary/test_fileselector_entry.c +++ b/src/bin/elementary/test_fileselector_entry.c @@ -258,6 +258,7 @@ test_fileselector_entry(void *data EINA_UNUSED, elm_box_pack_end(vbox, en); evas_object_show(en); - evas_object_resize(win, 400, 500); + evas_object_resize(win, 400 * elm_config_scale_get(), + 500 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_flip.c b/src/bin/elementary/test_flip.c index 78c2a6e665..4e63ebae47 100644 --- a/src/bin/elementary/test_flip.c +++ b/src/bin/elementary/test_flip.c @@ -262,7 +262,8 @@ test_flip(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info elm_box_pack_end(bx, bx2); evas_object_show(bx2); - evas_object_resize(win, 320, 480); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } @@ -432,7 +433,8 @@ test_flip2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf elm_box_pack_end(bx, bx2); evas_object_show(bx2); - evas_object_resize(win, 320, 480); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } @@ -546,7 +548,8 @@ test_flip3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf elm_box_pack_end(bx, bx2); evas_object_show(bx2); - evas_object_resize(win, 320, 480); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } @@ -688,7 +691,8 @@ test_flip_interactive(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, elm_box_pack_end(bx, bt); evas_object_show(bt); - evas_object_resize(win, 320, 480); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } @@ -765,6 +769,7 @@ test_flip_to(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i elm_box_pack_end(bx, bx2); evas_object_show(bx2); - evas_object_resize(win, 320, 480); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_flip_page.c b/src/bin/elementary/test_flip_page.c index dc80342ada..01a5d48d20 100644 --- a/src/bin/elementary/test_flip_page.c +++ b/src/bin/elementary/test_flip_page.c @@ -905,6 +905,7 @@ test_flip_page(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event evas_object_event_callback_add(rc, EVAS_CALLBACK_MOUSE_UP, im_up_cb, im); evas_object_event_callback_add(rc, EVAS_CALLBACK_MOUSE_MOVE, im_move_cb, im); - evas_object_resize(win, 480, 480); + evas_object_resize(win, 480 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_flip_page_eo.c b/src/bin/elementary/test_flip_page_eo.c index e313e2848c..dc25181f31 100644 --- a/src/bin/elementary/test_flip_page_eo.c +++ b/src/bin/elementary/test_flip_page_eo.c @@ -889,6 +889,7 @@ test_flip_page_eo(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev evas_object_event_callback_add(rc, EVAS_CALLBACK_MOUSE_UP, im_up_cb, im); evas_object_event_callback_add(rc, EVAS_CALLBACK_MOUSE_MOVE, im_move_cb, im); - evas_object_resize(win, 480, 480); + evas_object_resize(win, 480 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_floating.c b/src/bin/elementary/test_floating.c index b74cd4a762..848b4a9a59 100644 --- a/src/bin/elementary/test_floating.c +++ b/src/bin/elementary/test_floating.c @@ -93,7 +93,8 @@ test_floating(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ gl_sel/* func */, (void *)(uintptr_t)(i * 10)/* func data */); } - evas_object_resize(win, 480, 800); + evas_object_resize(win, 480 * elm_config_scale_get(), + 800 * elm_config_scale_get()); evas_object_show(win); ani = ecore_animator_add(anim, gl); diff --git a/src/bin/elementary/test_focus.c b/src/bin/elementary/test_focus.c index d1b04eef5e..249d7c7caa 100644 --- a/src/bin/elementary/test_focus.c +++ b/src/bin/elementary/test_focus.c @@ -100,7 +100,8 @@ test_focus(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf win = elm_win_util_standard_add("focus", "Focus"); elm_win_focus_highlight_enabled_set(win, EINA_TRUE); - evas_object_resize(win, 800, 600); + evas_object_resize(win, 800 * elm_config_scale_get(), + 600 * elm_config_scale_get()); elm_object_event_callback_add(win, _event, NULL); elm_win_autodel_set(win, EINA_TRUE); my_show(win); @@ -671,7 +672,8 @@ test_focus2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in elm_object_focus_next_object_set(bt2, en, ELM_FOCUS_DOWN); - evas_object_resize(win, 400, 400); + evas_object_resize(win, 400 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } @@ -774,7 +776,8 @@ test_focus_hide_del(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void * elm_box_pack_end(bx, bt); evas_object_show(bt); - evas_object_resize(win, 320, 480); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } @@ -898,7 +901,8 @@ test_focus3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in elm_box_pack_end(box, ck); evas_object_show(ck); - evas_object_resize(win, 320, 500); + evas_object_resize(win, 320 * elm_config_scale_get(), + 500 * elm_config_scale_get()); evas_object_show(win); } @@ -965,7 +969,8 @@ test_focus4(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_smart_callback_add(btn, "clicked", btn_clicked, btn2); evas_object_smart_callback_add(btn2, "clicked", btn_clicked2, btn2); - evas_object_resize(win, 400, 400); + evas_object_resize(win, 400 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } @@ -1076,7 +1081,8 @@ test_focus5(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_smart_callback_add(btn, "clicked", _focus5_btn_clicked, grid); evas_object_show(btn); - evas_object_resize(win, 400, 400); + evas_object_resize(win, 400 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } @@ -1221,7 +1227,8 @@ test_focus6(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_show(btn); // size and show the window - evas_object_resize(win, 400, 400); + evas_object_resize(win, 400 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } @@ -1281,6 +1288,7 @@ test_focus7(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in evas_object_show(btn); // size and show the window - evas_object_resize(win, 400, 400); + evas_object_resize(win, 400 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_focus_custom_chain.c b/src/bin/elementary/test_focus_custom_chain.c index c9d982b9c9..963bdeed57 100644 --- a/src/bin/elementary/test_focus_custom_chain.c +++ b/src/bin/elementary/test_focus_custom_chain.c @@ -99,7 +99,8 @@ create_win_bt_clicked(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void elm_grid_pack(gd, bt, 10, 70, 80, 20); evas_object_show(bt); - evas_object_resize(win, 160, 160); + evas_object_resize(win, 160 * elm_config_scale_get(), + 160 * elm_config_scale_get()); evas_object_show(win); } @@ -238,6 +239,7 @@ test_focus_custom_chain(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, vo elm_box_pack_end(bx, tg); evas_object_show(tg); - evas_object_resize(win, 320, 320); + evas_object_resize(win, 320 * elm_config_scale_get(), + 320 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_focus_policy.c b/src/bin/elementary/test_focus_policy.c index 66a424453a..c531d2b437 100644 --- a/src/bin/elementary/test_focus_policy.c +++ b/src/bin/elementary/test_focus_policy.c @@ -145,6 +145,7 @@ test_focus_object_policy(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, v evas_object_smart_callback_add(rd, "changed", _rdg_changed_cb, test_bt); } - evas_object_resize(win, 320, 320); + evas_object_resize(win, 320 * elm_config_scale_get(), + 320 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_focus_style.c b/src/bin/elementary/test_focus_style.c index 8856ed937e..8d07c6013c 100644 --- a/src/bin/elementary/test_focus_style.c +++ b/src/bin/elementary/test_focus_style.c @@ -112,7 +112,8 @@ test_focus_style(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve elm_box_pack_end(bx2, bt); evas_object_show(bt); - evas_object_resize(win, 320, 320); + evas_object_resize(win, 320 * elm_config_scale_get(), + 320 * elm_config_scale_get()); evas_object_show(win); } @@ -174,7 +175,8 @@ test_focus_part(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even elm_box_pack_end(bx, btn); evas_object_show(btn); - evas_object_resize(win, 320, 320); + evas_object_resize(win, 320 * elm_config_scale_get(), + 320 * elm_config_scale_get()); evas_object_show(win); } @@ -231,6 +233,7 @@ test_focus_object_style(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, vo elm_box_pack_end(bx, bt); evas_object_show(bt); - evas_object_resize(win, 320, 320); + evas_object_resize(win, 320 * elm_config_scale_get(), + 320 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_gengrid.c b/src/bin/elementary/test_gengrid.c index 83f2dd9262..a24de66496 100644 --- a/src/bin/elementary/test_gengrid.c +++ b/src/bin/elementary/test_gengrid.c @@ -466,7 +466,8 @@ filled_bt_clicked(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev elm_box_pack_end(box, tg); evas_object_show(tg); - evas_object_resize(win, 450, 200); + evas_object_resize(win, 450 * elm_config_scale_get(), + 200 * elm_config_scale_get()); evas_object_show(win); } @@ -520,7 +521,8 @@ cursor_bt_clicked(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev elm_box_pack_end(box, hbox); evas_object_show(hbox); - evas_object_resize(win, 450, 450); + evas_object_resize(win, 450 * elm_config_scale_get(), + 450 * elm_config_scale_get()); evas_object_show(win); } @@ -691,7 +693,8 @@ test_gengrid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i elm_box_pack_end(bx, bt); evas_object_show(bt); - evas_object_resize(win, 600, 600); + evas_object_resize(win, 600 * elm_config_scale_get(), + 600 * elm_config_scale_get()); evas_object_show(win); } @@ -957,7 +960,8 @@ test_gengrid2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ elm_gengrid_item_class_ref(gic); elm_gengrid_item_class_free(gic); - evas_object_resize(win, 600, 600); + evas_object_resize(win, 600 * elm_config_scale_get(), + 600 * elm_config_scale_get()); evas_object_show(win); } @@ -1022,7 +1026,8 @@ test_gengrid3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ evas_object_show(grid); - evas_object_resize(win, 600, 600); + evas_object_resize(win, 600 * elm_config_scale_get(), + 600 * elm_config_scale_get()); evas_object_show(win); } @@ -1157,7 +1162,8 @@ test_gengrid_item_styles(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, elm_box_pack_end(box, gengrid); evas_object_show(gengrid); - evas_object_resize(win, 600, 600); + evas_object_resize(win, 600 * elm_config_scale_get(), + 600 * elm_config_scale_get()); evas_object_show(win); } @@ -1566,7 +1572,8 @@ test_gengrid5(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ } elm_gengrid_item_class_free(itc); - evas_object_resize(win, 320, 500); + evas_object_resize(win, 320 * elm_config_scale_get(), + 500 * elm_config_scale_get()); evas_object_show(win); } @@ -1595,13 +1602,15 @@ test_gengrid_speed(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e evas_object_show(fr); api->grid = create_gengrid(win, 5000); + /* should we scale ? */ evas_object_size_hint_min_set(api->grid, 600, 600); elm_gengrid_item_size_set(api->grid, ELM_SCALE_SIZE(30), ELM_SCALE_SIZE(36)); elm_object_content_set(fr, api->grid); evas_object_show(api->grid); - evas_object_resize(win, 600, 600); + evas_object_resize(win, 600 * elm_config_scale_get(), + 600 * elm_config_scale_get()); evas_object_show(win); } @@ -2014,7 +2023,8 @@ test_gengrid_focus(void *data EINA_UNUSED, } elm_gengrid_item_class_free(ic); - evas_object_resize(win, 600, 600); + evas_object_resize(win, 600 * elm_config_scale_get(), + 600 * elm_config_scale_get()); evas_object_show(win); } @@ -2275,7 +2285,8 @@ test_gengrid_update(void *data EINA_UNUSED, } elm_gengrid_item_class_free(ic); - evas_object_resize(win, 600, 600); + evas_object_resize(win, 600 * elm_config_scale_get(), + 600 * elm_config_scale_get()); evas_object_show(win); } @@ -2347,7 +2358,8 @@ test_gengrid_disabled_item_focus(void *data EINA_UNUSED, elm_gengrid_item_class_free(ic); - evas_object_resize(win, 600, 600); + evas_object_resize(win, 600 * elm_config_scale_get(), + 600 * elm_config_scale_get()); evas_object_show(win); } @@ -2553,6 +2565,7 @@ test_gengrid_item_custom_size(void *data EINA_UNUSED, } elm_gengrid_item_class_free(ic); - evas_object_resize(win, 800, 600); + evas_object_resize(win, 800 * elm_config_scale_get(), + 600 * elm_config_scale_get()); } diff --git a/src/bin/elementary/test_genlist.c b/src/bin/elementary/test_genlist.c index 41ff4a3903..44cfe5ce74 100644 --- a/src/bin/elementary/test_genlist.c +++ b/src/bin/elementary/test_genlist.c @@ -540,7 +540,8 @@ test_genlist(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i } elm_genlist_item_class_free(api->itc1); - evas_object_resize(win, 480, 400); + evas_object_resize(win, 480 * elm_config_scale_get(), + 400 * elm_config_scale_get()); explode_win_enable(win); evas_object_show(win); @@ -925,8 +926,9 @@ test_genlist2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ evas_object_show(bx3); evas_object_event_callback_add(gl, EVAS_CALLBACK_DEL, _genlist_del_cb, api->itc1); - - evas_object_resize(win, 320, 320); + + evas_object_resize(win, 320 * elm_config_scale_get(), + 320 * elm_config_scale_get()); evas_object_show(win); } @@ -1083,7 +1085,8 @@ test_genlist3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ evas_object_show(bx2); elm_genlist_item_class_free(api->itc1); - evas_object_resize(win, 320, 320); + evas_object_resize(win, 320 * elm_config_scale_get(), + 320 * elm_config_scale_get()); evas_object_show(win); } @@ -1242,7 +1245,8 @@ test_genlist4(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ elm_box_pack_end(bx, bx2); evas_object_show(bx2); - evas_object_resize(win, 320, 320); + evas_object_resize(win, 320 * elm_config_scale_get(), + 320 * elm_config_scale_get()); evas_object_show(win); } @@ -1474,7 +1478,8 @@ test_genlist5(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ evas_object_show(bx2); elm_genlist_item_class_free(api->itc1); - evas_object_resize(win, 320, 320); + evas_object_resize(win, 320 * elm_config_scale_get(), + 320 * elm_config_scale_get()); evas_object_show(win); } @@ -1749,7 +1754,8 @@ test_genlist6(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ elm_box_pack_end(bx, gl); - evas_object_resize(win, 320, 320); + evas_object_resize(win, 320 * elm_config_scale_get(), + 320 * elm_config_scale_get()); evas_object_show(win); } @@ -1873,7 +1879,8 @@ test_genlist7(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ ELM_GENLIST_ITEM_NONE, gl_sel7/* func */, api/* func data */); - evas_object_resize(win, 320, 320); + evas_object_resize(win, 320 * elm_config_scale_get(), + 320 * elm_config_scale_get()); evas_object_show(win); } @@ -2069,7 +2076,8 @@ test_genlist8(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ elm_genlist_item_class_free(api->itc1); elm_genlist_item_class_free(api->itc2); - evas_object_resize(win, 480, 800); + evas_object_resize(win, 480 * elm_config_scale_get(), + 800 * elm_config_scale_get()); evas_object_show(win); } @@ -2271,7 +2279,8 @@ test_genlist9(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ elm_box_pack_end(bx2, bt); evas_object_show(bt); - evas_object_resize(win, 480, 800); + evas_object_resize(win, 480 * elm_config_scale_get(), + 800 * elm_config_scale_get()); evas_object_show(win); } @@ -2412,7 +2421,8 @@ test_genlist10(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event elm_box_pack_end(bx, gl); elm_genlist_item_class_free(api->itc1); - evas_object_resize(win, 520, 520); + evas_object_resize(win, 520 * elm_config_scale_get(), + 520 * elm_config_scale_get()); evas_object_show(win); } @@ -2579,7 +2589,8 @@ test_genlist_reorder(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, elm_box_pack_end(bx, gl); - evas_object_resize(win, 400, 500); + evas_object_resize(win, 400 * elm_config_scale_get(), + 500 * elm_config_scale_get()); evas_object_show(win); } @@ -2631,7 +2642,8 @@ test_genlist12(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event } elm_genlist_item_class_free(api->itc1); - evas_object_resize(win, 400, 500); + evas_object_resize(win, 400 * elm_config_scale_get(), + 500 * elm_config_scale_get()); evas_object_show(win); } @@ -2767,7 +2779,8 @@ test_genlist13(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event elm_box_pack_end(bx, bx1); evas_object_show(bx); - evas_object_resize(win, 480, 480); + evas_object_resize(win, 480 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } @@ -2997,7 +3010,8 @@ test_genlist14(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event elm_genlist_item_class_ref(api->itc2); elm_genlist_item_class_free(api->itc2); - evas_object_resize(win, 320, 320); + evas_object_resize(win, 320 * elm_config_scale_get(), + 320 * elm_config_scale_get()); evas_object_show(win); } @@ -3164,7 +3178,8 @@ test_genlist15(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event elm_box_pack_end(bx, bx2); evas_object_show(bx2); - evas_object_resize(win, 520, 520); + evas_object_resize(win, 520 * elm_config_scale_get(), + 520 * elm_config_scale_get()); evas_object_show(win); } @@ -3277,7 +3292,8 @@ test_genlist16(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event elm_box_pack_end(bx, gl); evas_object_show(bx); - evas_object_resize(win, 520, 520); + evas_object_resize(win, 520 * elm_config_scale_get(), + 520 * elm_config_scale_get()); evas_object_show(win); } @@ -3446,7 +3462,8 @@ test_genlist17(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event fr2 = _decorate_all_mode_frame_new(win, rdg, gl); elm_box_pack_end(bx2, fr2); - evas_object_resize(win, 520, 520); + evas_object_resize(win, 520 * elm_config_scale_get(), + 520 * elm_config_scale_get()); evas_object_show(win); } @@ -3672,7 +3689,8 @@ test_genlist18(void *data EINA_UNUSED, fr2 = _decorate_all_mode_frame_new(win, rdg, gl); elm_box_pack_end(bx2, fr2); - evas_object_resize(win, 400, 800); + evas_object_resize(win, 400 * elm_config_scale_get(), + 800 * elm_config_scale_get()); evas_object_show(win); } @@ -3764,7 +3782,8 @@ test_genlist19(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event } elm_genlist_item_class_free(api->itc1); - evas_object_resize(win, 480, 800); + evas_object_resize(win, 480 * elm_config_scale_get(), + 800 * elm_config_scale_get()); evas_object_show(win); } @@ -3876,7 +3895,8 @@ test_genlist_item_styles(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, evas_object_data_set(list, "genlist", gl); - evas_object_resize(win, 600, 600); + evas_object_resize(win, 600 * elm_config_scale_get(), + 600 * elm_config_scale_get()); evas_object_show(win); } @@ -4012,7 +4032,8 @@ test_genlist_multi_select(void *data EINA_UNUSED, } elm_genlist_item_class_free(itc); - evas_object_resize(win, 320, 500); + evas_object_resize(win, 320 * elm_config_scale_get(), + 500 * elm_config_scale_get()); evas_object_show(win); } @@ -4279,7 +4300,8 @@ test_genlist20(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, elm_genlist_item_class_free(itc); - evas_object_resize(win, 320, 500); + evas_object_resize(win, 320 * elm_config_scale_get(), + 500 * elm_config_scale_get()); evas_object_show(win); } @@ -4447,7 +4469,8 @@ test_genlist_del(void *data EINA_UNUSED, gl = _gl_del_genlist_add(bx); _gl_del_item_append(gl, itc); - evas_object_resize(win, 320, 500); + evas_object_resize(win, 320 * elm_config_scale_get(), + 500 * elm_config_scale_get()); evas_object_show(win); } @@ -5197,7 +5220,8 @@ test_genlist_focus(void *data EINA_UNUSED, // Options _test_genlist_focus_option_panel_create(win, bx, gl, it_1, it_2); - evas_object_resize(win, 420, 600); + evas_object_resize(win, 420 * elm_config_scale_get(), + 600 * elm_config_scale_get()); evas_object_show(win); } @@ -5344,7 +5368,8 @@ test_genlist_filter(void *data EINA_UNUSED, ELM_GENLIST_ITEM_NONE, NULL, NULL); - evas_object_resize(win, 420, 600); + evas_object_resize(win, 420 * elm_config_scale_get(), + 600 * elm_config_scale_get()); evas_object_show(win); elm_object_focus_set(entry, EINA_TRUE); evas_object_smart_callback_add(entry, "changed,user", _entry_change_cb, api); @@ -5499,7 +5524,8 @@ test_genlist_show_bring(void *data EINA_UNUSED, elm_genlist_item_selected_set(gli, EINA_TRUE); elm_genlist_item_show(gli, ELM_GENLIST_ITEM_SCROLLTO_MIDDLE); - evas_object_resize(win, 480, 400); + evas_object_resize(win, 480 * elm_config_scale_get(), + 400 * elm_config_scale_get()); explode_win_enable(win); evas_object_show(win); } @@ -5565,7 +5591,8 @@ test_genlist_show_item(void *data, ecore_timer_add(0.1, _late_item_prepender, g_data); } - evas_object_resize(win, 480, 400); + evas_object_resize(win, 480 * elm_config_scale_get(), + 400 * elm_config_scale_get()); explode_win_enable(win); evas_object_show(win); } @@ -5620,7 +5647,8 @@ test_genlist_show_tree(void *data, elm_genlist_item_class_free(api->itc1); elm_genlist_item_show(show, g_data->type); - evas_object_resize(win, 480, 400); + evas_object_resize(win, 480 * elm_config_scale_get(), + 400 * elm_config_scale_get()); explode_win_enable(win); evas_object_show(win); } @@ -5775,7 +5803,8 @@ test_genlist_item_show(void *data EINA_UNUSED, evas_object_show(bt_bring); elm_box_pack_end(bx, bt_bring); - evas_object_resize(win, 480, 400); + evas_object_resize(win, 480 * elm_config_scale_get(), + 400 * elm_config_scale_get()); explode_win_enable(win); evas_object_show(win); } @@ -5862,7 +5891,8 @@ test_genlist_cache(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, elm_genlist_item_class_free(itc); - evas_object_resize(win, 480, 400); + evas_object_resize(win, 480 * elm_config_scale_get(), + 400 * elm_config_scale_get()); explode_win_enable(win); evas_object_show(win); } @@ -6031,7 +6061,8 @@ test_genlist_reusable(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, evas_object_show(ck); // show everything - evas_object_resize(win, 400, 400); + evas_object_resize(win, 400 * elm_config_scale_get(), + 400 * elm_config_scale_get()); explode_win_enable(win); evas_object_show(win); } diff --git a/src/bin/elementary/test_gesture_layer.c b/src/bin/elementary/test_gesture_layer.c index 28f3582ce7..42afbb9333 100644 --- a/src/bin/elementary/test_gesture_layer.c +++ b/src/bin/elementary/test_gesture_layer.c @@ -357,7 +357,6 @@ void test_gesture_layer(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { - Evas_Coord w, h; Evas_Object *win, *bg; char buf[PATH_MAX]; int ind = 0; @@ -365,13 +364,9 @@ test_gesture_layer(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, photo_array = calloc(4, sizeof(*photo_array)); if (!photo_array) return; - w = 480; - h = 800; - win = elm_win_add(NULL, "gesture-layer", ELM_WIN_BASIC); elm_win_title_set(win, "Gesture Layer"); elm_win_autodel_set(win, EINA_TRUE); - evas_object_resize(win, w, h); bg = elm_bg_add(win); snprintf(buf, sizeof(buf), "%s/images/wood_01.jpg", elm_app_data_dir_get()); @@ -400,5 +395,8 @@ test_gesture_layer(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, photo_array[ind] = NULL; evas_object_smart_callback_add(win, "delete,request", _win_del_req, photo_array); + + evas_object_resize(win, 480 * elm_config_scale_get(), + 800 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_gesture_layer3.c b/src/bin/elementary/test_gesture_layer3.c index 7e5007aed1..d7525cfeb6 100644 --- a/src/bin/elementary/test_gesture_layer3.c +++ b/src/bin/elementary/test_gesture_layer3.c @@ -555,7 +555,6 @@ void test_gesture_layer3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { - Evas_Coord w, h; Evas_Object *win, *bg; char buf[PATH_MAX]; int ind = 0; @@ -563,13 +562,9 @@ test_gesture_layer3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, photo_array = calloc(4, sizeof(*photo_array)); if (!photo_array) return; - w = 480; - h = 800; - win = elm_win_add(NULL, "gesture-layer3", ELM_WIN_BASIC); elm_win_title_set(win, "Gesture Layer 3"); elm_win_autodel_set(win, EINA_TRUE); - evas_object_resize(win, w, h); bg = elm_bg_add(win); snprintf(buf, sizeof(buf), "%s/images/wood_01.jpg", elm_app_data_dir_get()); @@ -584,5 +579,8 @@ test_gesture_layer3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, photo_array[ind] = NULL; evas_object_smart_callback_add(win, "delete,request", _win_del_req, photo_array); + + evas_object_resize(win, 480 * elm_config_scale_get(), + 800 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_glview.c b/src/bin/elementary/test_glview.c index 2ddb819561..70bb156922 100644 --- a/src/bin/elementary/test_glview.c +++ b/src/bin/elementary/test_glview.c @@ -728,7 +728,8 @@ _test_glview_do(Evas_GL_Context_Version version) evas_object_show(bt); evas_object_smart_callback_add(bt, "clicked", _on_done, win); - evas_object_resize(win, 320, 480); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_glview_manygears.c b/src/bin/elementary/test_glview_manygears.c index fbf404bf4f..bffff3a55c 100644 --- a/src/bin/elementary/test_glview_manygears.c +++ b/src/bin/elementary/test_glview_manygears.c @@ -954,6 +954,7 @@ test_glview_manygears(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void evas_object_show(bt_ok); evas_object_smart_callback_add(bt_ok, "clicked", _on_done, win); - evas_object_resize(win, 320, 480); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_glview_simple.c b/src/bin/elementary/test_glview_simple.c index 9e34afe17f..44736ef992 100644 --- a/src/bin/elementary/test_glview_simple.c +++ b/src/bin/elementary/test_glview_simple.c @@ -294,6 +294,7 @@ test_glview_simple(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e evas_object_show(bt); evas_object_smart_callback_add(bt, "clicked", _close_cb, win); - evas_object_resize(win, 320, 480); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_grid.c b/src/bin/elementary/test_grid.c index fc34ded8ed..eedee3e3f6 100644 --- a/src/bin/elementary/test_grid.c +++ b/src/bin/elementary/test_grid.c @@ -184,6 +184,7 @@ test_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info elm_grid_pack(gd, rc, 60, 80, 10, 10); evas_object_show(rc); - evas_object_resize(win, 480, 480); + evas_object_resize(win, 480 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_hover.c b/src/bin/elementary/test_hover.c index a2edea4c64..f862caf774 100644 --- a/src/bin/elementary/test_hover.c +++ b/src/bin/elementary/test_hover.c @@ -96,7 +96,8 @@ test_hover(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf elm_object_part_content_set(hv, "right", bt); evas_object_show(bt); - evas_object_resize(win, 440, 440); + evas_object_resize(win, 440 * elm_config_scale_get(), + 440 * elm_config_scale_get()); evas_object_show(win); } @@ -168,7 +169,8 @@ test_hover2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in elm_object_part_content_set(hv, "right", bt); evas_object_show(bt); - evas_object_resize(win, 440, 440); + evas_object_resize(win, 440 * elm_config_scale_get(), + 440 * elm_config_scale_get()); evas_object_show(win); } @@ -244,6 +246,7 @@ test_hover3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, evas_object_show(bt); evas_object_smart_callback_add(bt, "clicked", _dismiss_hover, hv); - evas_object_resize(win, 440, 440); + evas_object_resize(win, 440 * elm_config_scale_get(), + 440 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_hoversel.c b/src/bin/elementary/test_hoversel.c index b59a6c3efe..9e90fddb8f 100644 --- a/src/bin/elementary/test_hoversel.c +++ b/src/bin/elementary/test_hoversel.c @@ -313,7 +313,8 @@ test_hoversel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ elm_box_pack_end(bx, hoversel); evas_object_show(hoversel); - evas_object_resize(win, 320, 500); + evas_object_resize(win, 320 * elm_config_scale_get(), + 500 * elm_config_scale_get()); evas_object_show(win); } @@ -411,6 +412,7 @@ test_hoversel_focus(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void * evas_object_smart_callback_add(hoversel, "expanded", _hoversel_expanded_cb2, it); - evas_object_resize(win, 320, 500); + evas_object_resize(win, 320 * elm_config_scale_get(), + 500 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_icon.c b/src/bin/elementary/test_icon.c index ecd810baa9..4ca8c8c039 100644 --- a/src/bin/elementary/test_icon.c +++ b/src/bin/elementary/test_icon.c @@ -45,7 +45,8 @@ bt_clicked(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf elm_image_prescale_set(ic, EINA_TRUE); evas_object_show(ic); - evas_object_resize(win, 350, 350); + evas_object_resize(win, 350 * elm_config_scale_get(), + 350 * elm_config_scale_get()); evas_object_show(win); } @@ -114,7 +115,8 @@ test_icon(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info elm_win_icon_object_set(win, ic); evas_object_show(ic); - evas_object_resize(win, 400, 400); + evas_object_resize(win, 400 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } @@ -693,7 +695,8 @@ _std_btn_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, elm_object_part_content_set(panes, "right", icon); evas_object_show(icon); - evas_object_resize(win, 300, 200); + evas_object_resize(win, 300 * elm_config_scale_get(), + 200 * elm_config_scale_get()); evas_object_show(win); } @@ -852,6 +855,7 @@ test_icon_standard(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, evas_object_show(bt); // show the win - evas_object_resize(win, 300, 500); + evas_object_resize(win, 300 * elm_config_scale_get(), + 500 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_icon_desktops.c b/src/bin/elementary/test_icon_desktops.c index 6ab9511162..9d3cd12322 100644 --- a/src/bin/elementary/test_icon_desktops.c +++ b/src/bin/elementary/test_icon_desktops.c @@ -101,6 +101,7 @@ test_icon_desktops(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e #endif elm_genlist_item_class_free(it_desk); - evas_object_resize(win, 320, 480); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_image.c b/src/bin/elementary/test_image.c index 38304cc6e4..74eb95b295 100644 --- a/src/bin/elementary/test_image.c +++ b/src/bin/elementary/test_image.c @@ -78,7 +78,8 @@ test_image(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in } } - evas_object_resize(win, 320, 480); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } @@ -172,7 +173,8 @@ test_image_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, voi } } - evas_object_resize(win, 320, 480); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } @@ -227,7 +229,8 @@ test_image_swallow_align(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, evas_object_show(sl); evas_object_data_set(win, "v_sl", sl); - evas_object_resize(win, 300, 600); + evas_object_resize(win, 300 * elm_config_scale_get(), + 600 * elm_config_scale_get()); evas_object_show(win); } @@ -395,8 +398,9 @@ test_remote_image(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e // set file now _url_activate_cb(win, o, NULL); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); - evas_object_resize(win, 320, 480); } static void @@ -438,7 +442,8 @@ test_click_image(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev elm_box_pack_end(box, label); evas_object_show(label); - evas_object_resize(win, 320, 480); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } @@ -640,7 +645,8 @@ test_load_image(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve evas_object_show(hbox); elm_box_pack_end(box, hbox); - evas_object_resize(win, 320, 480); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } @@ -715,6 +721,7 @@ test_image_prescale(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void * elm_box_pack_end(box, hbox); evas_object_show(hbox); - evas_object_resize(win, 320, 320); + evas_object_resize(win, 320 * elm_config_scale_get(), + 320 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_index.c b/src/bin/elementary/test_index.c index 085f8493db..8919340c7f 100644 --- a/src/bin/elementary/test_index.c +++ b/src/bin/elementary/test_index.c @@ -259,7 +259,8 @@ test_index(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf evas_object_smart_callback_add(id, "selected", _index_selected_cb, NULL); elm_index_level_go(id, 0); - evas_object_resize(win, 320, 270); + evas_object_resize(win, 320 * elm_config_scale_get(), + 270 * elm_config_scale_get()); evas_object_show(win); } @@ -430,7 +431,8 @@ test_index2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in elm_list_go(gui->lst); evas_object_show(gui->lst); - evas_object_resize(win, 320, 480); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } @@ -523,7 +525,8 @@ test_index3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in elm_index_level_go(index, 0); - evas_object_resize(win, 300, 300); + evas_object_resize(win, 300 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(win); } @@ -580,6 +583,7 @@ test_index_horizontal(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, evas_object_smart_callback_add(id, "changed", _index_list_changed_cb, NULL); elm_index_level_go(id, 0); - evas_object_resize(win, 480, 320); + evas_object_resize(win, 480 * elm_config_scale_get(), + 320 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_inwin.c b/src/bin/elementary/test_inwin.c index 94dfe63663..10e3511b58 100644 --- a/src/bin/elementary/test_inwin.c +++ b/src/bin/elementary/test_inwin.c @@ -94,7 +94,8 @@ test_inwin(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf elm_win_inwin_content_set(inwin, bxx); evas_object_show(lb); - evas_object_resize(win, 320, 240); + evas_object_resize(win, 320 * elm_config_scale_get(), + 240 * elm_config_scale_get()); evas_object_show(win); } @@ -124,7 +125,8 @@ test_inwin2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in elm_win_inwin_content_set(inwin, lb); evas_object_show(lb); - evas_object_resize(win, 320, 240); + evas_object_resize(win, 320 * elm_config_scale_get(), + 240 * elm_config_scale_get()); evas_object_show(win); } @@ -156,6 +158,7 @@ test_inwin3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in elm_box_pack_end(box, lb); evas_object_show(lb); - evas_object_resize(win, 320, 240); + evas_object_resize(win, 320 * elm_config_scale_get(), + 240 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_label.c b/src/bin/elementary/test_label.c index a7f0d62da0..9673e80f59 100644 --- a/src/bin/elementary/test_label.c +++ b/src/bin/elementary/test_label.c @@ -86,7 +86,8 @@ test_label(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf elm_box_pack_end(bx, lb); evas_object_show(lb); - evas_object_resize(win, 320, 300); + evas_object_resize(win, 320 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(bx); evas_object_show(win); @@ -305,7 +306,8 @@ test_label_slide(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve evas_object_smart_callback_add(bt, "clicked", _label_slide_stop_cb, lbs); - evas_object_resize(win, 320, 320); + evas_object_resize(win, 320 * elm_config_scale_get(), + 320 * elm_config_scale_get()); evas_object_show(win); } @@ -739,7 +741,8 @@ test_label_ellipsis(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void * elm_box_pack_end(bx, lb); evas_object_show(lb); - evas_object_resize(win, 300, 100); + evas_object_resize(win, 300 * elm_config_scale_get(), + 100 * elm_config_scale_get()); evas_object_show(win); } @@ -908,6 +911,7 @@ test_label_emoji(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve _font_set(txt, "Sans"); evas_object_show(cmb); - evas_object_resize(win, 300, 400); + evas_object_resize(win, 300 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_launcher.c b/src/bin/elementary/test_launcher.c index 910fa6998f..2353ccc25a 100644 --- a/src/bin/elementary/test_launcher.c +++ b/src/bin/elementary/test_launcher.c @@ -371,7 +371,8 @@ test_launcher(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ evas_object_show(tb2); - evas_object_resize(win, 480, 400); + evas_object_resize(win, 480 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } @@ -496,7 +497,8 @@ test_launcher2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event evas_object_show(tb2); - evas_object_resize(win, 555, 410); + evas_object_resize(win, 555 * elm_config_scale_get(), + 410 * elm_config_scale_get()); evas_object_show(win); } @@ -916,6 +918,7 @@ test_launcher3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event evas_object_show(tb2); - evas_object_resize(win, 480, 400); + evas_object_resize(win, 480 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_layout.c b/src/bin/elementary/test_layout.c index fce1b93cd1..f37ce154f3 100644 --- a/src/bin/elementary/test_layout.c +++ b/src/bin/elementary/test_layout.c @@ -266,6 +266,7 @@ test_layout2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i evas_object_show(lb); elm_layout_table_pack(ly, "elm.table.content", lb, 0, 1, 1, 1); - evas_object_resize(win, 320, 320); + evas_object_resize(win, 320 * elm_config_scale_get(), + 320 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_list.c b/src/bin/elementary/test_list.c index f02df5c4a1..d5fd8ceca3 100644 --- a/src/bin/elementary/test_list.c +++ b/src/bin/elementary/test_list.c @@ -440,7 +440,8 @@ test_list(void *data EINA_UNUSED, evas_object_show(tb2); - evas_object_resize(win, 320, 300); + evas_object_resize(win, 320 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(win); evas_object_smart_callback_add(li, "edge,top", scroll_top, NULL); @@ -568,7 +569,8 @@ test_list_horizontal(void *data EINA_UNUSED, evas_object_show(tb2); - evas_object_resize(win, 320, 300); + evas_object_resize(win, 320 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(win); } @@ -693,7 +695,8 @@ test_list2(void *data EINA_UNUSED, elm_box_pack_end(bx, bt); evas_object_show(bt); - evas_object_resize(win, 320, 500); + evas_object_resize(win, 320 * elm_config_scale_get(), + 500 * elm_config_scale_get()); evas_object_show(win); } @@ -819,7 +822,8 @@ test_list3(void *data EINA_UNUSED, evas_object_show(li); - evas_object_resize(win, 320, 300); + evas_object_resize(win, 320 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(win); } @@ -968,7 +972,8 @@ test_list4(void *data EINA_UNUSED, elm_list_go(li); evas_object_show(li); - evas_object_resize(win, 320, 300); + evas_object_resize(win, 320 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(win); } @@ -1029,7 +1034,8 @@ test_list5(void *data EINA_UNUSED, elm_list_item_append(li, "Audio", NULL, NULL, NULL, &info); elm_list_go(li); - evas_object_resize(win, 320, 300); + evas_object_resize(win, 320 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(win); } @@ -1175,7 +1181,8 @@ test_list6(void *data EINA_UNUSED, evas_object_data_set(li, "label", lb); evas_object_show(gd); - evas_object_resize(win, 480, 480); + evas_object_resize(win, 480 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } @@ -1226,7 +1233,8 @@ test_list7(void *data EINA_UNUSED, elm_list_go(li); evas_object_show(li); - evas_object_resize(win, 320, 300); + evas_object_resize(win, 320 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(win); } @@ -1698,7 +1706,8 @@ _test_list_focus(const char *name, const char *title, Eina_Bool horiz) elm_list_go(li); evas_object_show(li); - evas_object_resize(win, 420, 600); + evas_object_resize(win, 420 * elm_config_scale_get(), + 600 * elm_config_scale_get()); evas_object_show(win); } @@ -1823,7 +1832,8 @@ test_list_separator(void *data EINA_UNUSED, evas_object_show(li); - evas_object_resize(win, 320, 300); + evas_object_resize(win, 320 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(win); } @@ -1948,6 +1958,7 @@ test_list_multi_select(void *data EINA_UNUSED, elm_list_go(li); - evas_object_resize(win, 320, 500); + evas_object_resize(win, 320 * elm_config_scale_get(), + 500 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_main_menu.c b/src/bin/elementary/test_main_menu.c index bb52527031..585764e868 100644 --- a/src/bin/elementary/test_main_menu.c +++ b/src/bin/elementary/test_main_menu.c @@ -74,6 +74,7 @@ test_main_menu(void *data EINA_UNUSED, menu_it1 = elm_menu_item_add(menu, menu_it, NULL, "sub menu", NULL, NULL); elm_menu_item_add(menu, menu_it1, NULL, "first item", NULL, NULL); - evas_object_resize(win, 250, 350); + evas_object_resize(win, 250 * elm_config_scale_get(), + 350 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_menu.c b/src/bin/elementary/test_menu.c index ba174fba9e..41ebc5b94c 100644 --- a/src/bin/elementary/test_menu.c +++ b/src/bin/elementary/test_menu.c @@ -137,7 +137,8 @@ test_menu(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _menu_show_cb, menu); - evas_object_resize(win, 350, 200); + evas_object_resize(win, 350 * elm_config_scale_get(), + 200 * elm_config_scale_get()); evas_object_show(win); } @@ -309,6 +310,7 @@ test_menu2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf evas_object_smart_callback_add(bt, "clicked", _close_bt_clicked, mn); evas_object_show(bt); - evas_object_resize(win, 320, 320); + evas_object_resize(win, 320 * elm_config_scale_get(), + 320 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_multi.c b/src/bin/elementary/test_multi.c index 5608cc8563..7a316e11b8 100644 --- a/src/bin/elementary/test_multi.c +++ b/src/bin/elementary/test_multi.c @@ -125,8 +125,10 @@ test_multi(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf elm_box_pack_end(bx, bt); evas_object_show(bt); - evas_object_size_hint_min_set(bg, 160, 160); - evas_object_resize(win, 480, 800); + evas_object_size_hint_min_set(bg, 160 * elm_config_scale_get(), + 160 * elm_config_scale_get()); + evas_object_resize(win, 480 * elm_config_scale_get(), + 800 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_multibuttonentry.c b/src/bin/elementary/test_multibuttonentry.c index e4c3370908..b2c1f30b6f 100644 --- a/src/bin/elementary/test_multibuttonentry.c +++ b/src/bin/elementary/test_multibuttonentry.c @@ -256,7 +256,8 @@ test_multibuttonentry(void *data EINA_UNUSED, sc = _add_multibuttonentry(ly); elm_object_part_content_set(ly, "multibuttonentry", sc); - evas_object_resize(win, 320, 480); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } @@ -342,6 +343,7 @@ test_multibuttonentry2(void *data EINA_UNUSED, sc = _add_multibuttonentry_shrink(ly); elm_object_part_content_set(ly, "multibuttonentry", sc); - evas_object_resize(win, 320, 480); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_naviframe.c b/src/bin/elementary/test_naviframe.c index 36e4bdb332..a6d8f8404f 100644 --- a/src/bin/elementary/test_naviframe.c +++ b/src/bin/elementary/test_naviframe.c @@ -336,7 +336,8 @@ test_naviframe(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event it = elm_naviframe_item_push(nf, "Page 1", NULL, btn, content, NULL); evas_object_data_set(nf, "page1", it); - evas_object_resize(win, 400, 400); + evas_object_resize(win, 400 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } @@ -371,7 +372,8 @@ test_naviframe2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even elm_object_item_part_content_set(it, "icon", sc); - evas_object_resize(win, 400, 400); + evas_object_resize(win, 400 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } @@ -428,6 +430,7 @@ test_naviframe3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even evas_object_data_set(tb, "root", it); elm_toolbar_item_append(tb, NULL, "Pop all", _bt_pop_all, nf); - evas_object_resize(win, 400, 400); + evas_object_resize(win, 400 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_naviframe_complex.c b/src/bin/elementary/test_naviframe_complex.c index 63539c7009..7fe615bbff 100644 --- a/src/bin/elementary/test_naviframe_complex.c +++ b/src/bin/elementary/test_naviframe_complex.c @@ -362,6 +362,7 @@ test_naviframe_complex(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, voi } elm_toolbar_item_selected_set(elm_toolbar_last_item_get(tb), EINA_TRUE); - evas_object_resize(win, 400, 400); + evas_object_resize(win, 400 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_notify.c b/src/bin/elementary/test_notify.c index 3d00006886..1db28a7a0f 100644 --- a/src/bin/elementary/test_notify.c +++ b/src/bin/elementary/test_notify.c @@ -443,6 +443,7 @@ test_notify(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in elm_table_pack(tb, bt, 4, 1, 1, 3); evas_object_show(bt); - evas_object_resize(win, 400, 400); + evas_object_resize(win, 400 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_panel.c b/src/bin/elementary/test_panel.c index a6318d1c29..d4d45f1b28 100644 --- a/src/bin/elementary/test_panel.c +++ b/src/bin/elementary/test_panel.c @@ -295,7 +295,8 @@ test_panel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf elm_object_content_set(panel, toolbar); evas_object_show(toolbar); - evas_object_resize(win, 320, 400); + evas_object_resize(win, 320 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } @@ -344,8 +345,6 @@ test_panel2(void *data EINA_UNUSED, // Left Panel win = elm_win_util_standard_add("panel", "Left Panel"); elm_win_autodel_set(win, EINA_TRUE); - evas_object_resize(win, 320, 400); - evas_object_show(win); // box for button and table box = elm_box_add(win); @@ -419,4 +418,8 @@ test_panel2(void *data EINA_UNUSED, evas_object_smart_callback_add(panel, "toggled", _toggled_cb, check); evas_object_smart_callback_add(button, "clicked", _clicked_cb, panel); + + evas_object_resize(win, 320 * elm_config_scale_get(), + 400 * elm_config_scale_get()); + evas_object_show(win); } diff --git a/src/bin/elementary/test_panes.c b/src/bin/elementary/test_panes.c index 8560daa504..e508895c1a 100644 --- a/src/bin/elementary/test_panes.c +++ b/src/bin/elementary/test_panes.c @@ -102,7 +102,8 @@ _test_panes(const char *style) evas_object_show(bt); elm_object_part_content_set(panes_h, "bottom", bt); - evas_object_resize(win, 320, 400); + evas_object_resize(win, 320 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_photo.c b/src/bin/elementary/test_photo.c index 7a6e0baf53..732c36132d 100644 --- a/src/bin/elementary/test_photo.c +++ b/src/bin/elementary/test_photo.c @@ -95,6 +95,7 @@ test_photo(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf evas_object_show(tb); evas_object_show(sc); - evas_object_resize(win, 300, 300); + evas_object_resize(win, 300 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_photocam.c b/src/bin/elementary/test_photocam.c index 687033b0f1..8b02f6b7af 100644 --- a/src/bin/elementary/test_photocam.c +++ b/src/bin/elementary/test_photocam.c @@ -455,7 +455,8 @@ test_photocam(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ evas_object_show(box); evas_object_show(tb2); - evas_object_resize(win, 800, 800); + evas_object_resize(win, 800 * elm_config_scale_get(), + 800 * elm_config_scale_get()); evas_object_show(win); } @@ -626,7 +627,8 @@ test_photocam_remote(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void evas_object_show(box); evas_object_show(tb2); - evas_object_resize(win, 800, 800); + evas_object_resize(win, 800 * elm_config_scale_get(), + 800 * elm_config_scale_get()); evas_object_show(win); } @@ -743,7 +745,8 @@ test_photocam_icon(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e evas_object_show(rd); } - evas_object_resize(win, 150, 150); + evas_object_resize(win, 150 * elm_config_scale_get(), + 150 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_popup.c b/src/bin/elementary/test_popup.c index da9bbca934..1f3a4f4ec8 100644 --- a/src/bin/elementary/test_popup.c +++ b/src/bin/elementary/test_popup.c @@ -936,6 +936,7 @@ test_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, is_popup_scroll = EINA_TRUE; } - evas_object_resize(win, 480, 400); + evas_object_resize(win, 480 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_scaling.c b/src/bin/elementary/test_scaling.c index 132aea9e4d..c855830bce 100644 --- a/src/bin/elementary/test_scaling.c +++ b/src/bin/elementary/test_scaling.c @@ -64,7 +64,8 @@ test_scaling(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i elm_box_pack_end(bx, bt); evas_object_show(bt); - evas_object_resize(win, 320, 320); + evas_object_resize(win, 320 * elm_config_scale_get(), + 320 * elm_config_scale_get()); evas_object_show(win); } @@ -174,6 +175,7 @@ test_scaling2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ elm_box_pack_end(bx, fr); evas_object_show(fr); - evas_object_resize(win, 320, 320); + evas_object_resize(win, 320 * elm_config_scale_get(), + 320 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_scroller.c b/src/bin/elementary/test_scroller.c index 1626564900..27be969839 100644 --- a/src/bin/elementary/test_scroller.c +++ b/src/bin/elementary/test_scroller.c @@ -455,7 +455,8 @@ test_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ evas_object_resize(tb2, w, h); evas_object_show(tb2); - evas_object_resize(win, 320, 420); + evas_object_resize(win, 320 * elm_config_scale_get(), + 420 * elm_config_scale_get()); evas_object_show(win); } @@ -677,7 +678,8 @@ test_scroller2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event bounce->scroller = sc; - evas_object_resize(win, 320, 480); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _scroll2_del_cb, bounce); @@ -745,7 +747,8 @@ test_scroller_simple(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void elm_box_pack_end(bx, bt); evas_object_show(bt); } - evas_object_resize(win, 320, 400); + evas_object_resize(win, 320 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } @@ -908,7 +911,8 @@ test_scroller3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event evas_object_smart_callback_add(bt3, "clicked", _append_items, bx4); evas_object_smart_callback_add(sl, "changed", _changed_cb, sc); - evas_object_resize(win, 500, 500); + evas_object_resize(win, 500 * elm_config_scale_get(), + 500 * elm_config_scale_get()); evas_object_show(win); } @@ -972,7 +976,8 @@ test_scroller4(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event elm_box_pack_end(bx, ly); evas_object_show(ly); - evas_object_resize(win, 400, 550); + evas_object_resize(win, 400 * elm_config_scale_get(), + 550 * elm_config_scale_get()); evas_object_show(win); } @@ -1072,7 +1077,8 @@ test_scroller5(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event elm_object_focus_set(btn, EINA_TRUE); - evas_object_resize(win, 400, 550); + evas_object_resize(win, 400 * elm_config_scale_get(), + 550 * elm_config_scale_get()); evas_object_show(win); } @@ -1116,7 +1122,8 @@ test_scroller6(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event elm_table_pack(table, btn2, 1, 0, 1, 1); evas_object_show(btn2); - evas_object_resize(win, 400, 550); + evas_object_resize(win, 400 * elm_config_scale_get(), + 550 * elm_config_scale_get()); evas_object_show(win); } @@ -1188,6 +1195,7 @@ test_scroller7(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event elm_table_pack(table, btn2, 1, 0, 1, 1); evas_object_show(btn2); - evas_object_resize(win, 400, 550); + evas_object_resize(win, 400 * elm_config_scale_get(), + 550 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_segment_control.c b/src/bin/elementary/test_segment_control.c index 9f5d674013..3bc4725141 100644 --- a/src/bin/elementary/test_segment_control.c +++ b/src/bin/elementary/test_segment_control.c @@ -151,6 +151,7 @@ test_segment_control(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void elm_box_pack_end(bx, sc); } - evas_object_resize(win, 400, 300); + evas_object_resize(win, 400 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_slideshow.c b/src/bin/elementary/test_slideshow.c index 449d0164cc..1523ba20b5 100644 --- a/src/bin/elementary/test_slideshow.c +++ b/src/bin/elementary/test_slideshow.c @@ -231,6 +231,7 @@ test_slideshow(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event evas_object_event_callback_add(slideshow, EVAS_CALLBACK_MOUSE_MOVE, _notify_show, notify); - evas_object_resize(win, 500, 400); + evas_object_resize(win, 500 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_spinner.c b/src/bin/elementary/test_spinner.c index 41eb63f48e..1d5aa612cc 100644 --- a/src/bin/elementary/test_spinner.c +++ b/src/bin/elementary/test_spinner.c @@ -108,6 +108,7 @@ test_spinner(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i elm_box_pack_end(bx, sp); evas_object_show(sp); - evas_object_resize(win, 300, 300); + evas_object_resize(win, 300 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_store.c b/src/bin/elementary/test_store.c index 95beb8b387..2e76267bb3 100644 --- a/src/bin/elementary/test_store.c +++ b/src/bin/elementary/test_store.c @@ -262,6 +262,7 @@ test_store(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf elm_genlist_item_class_ref(itc1); elm_genlist_item_class_free(itc1); - evas_object_resize(win, 480, 800); + evas_object_resize(win, 480 * elm_config_scale_get(), + 800 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_thumb.c b/src/bin/elementary/test_thumb.c index 9d4a33ed28..24dc990f0f 100644 --- a/src/bin/elementary/test_thumb.c +++ b/src/bin/elementary/test_thumb.c @@ -58,6 +58,7 @@ test_thumb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf evas_object_show(tb); evas_object_show(sc); - evas_object_resize(win, 600, 600); + evas_object_resize(win, 600 * elm_config_scale_get(), + 600 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_toolbar.c b/src/bin/elementary/test_toolbar.c index 4b3bac1760..a917b8630c 100644 --- a/src/bin/elementary/test_toolbar.c +++ b/src/bin/elementary/test_toolbar.c @@ -196,7 +196,8 @@ test_toolbar(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i elm_box_pack_end(bx, tb); evas_object_show(tb); - evas_object_resize(win, 320, 300); + evas_object_resize(win, 320 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(win); } @@ -300,7 +301,8 @@ test_toolbar2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ elm_box_pack_end(bx, tb); evas_object_show(tb); - evas_object_resize(win, 320, 300); + evas_object_resize(win, 320 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(win); } @@ -403,7 +405,8 @@ test_toolbar3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ elm_box_pack_end(bx, tb); evas_object_show(tb); - evas_object_resize(win, 320, 300); + evas_object_resize(win, 320 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(win); } @@ -507,7 +510,8 @@ test_toolbar4(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ elm_box_pack_end(bx, tb); evas_object_show(tb); - evas_object_resize(win, 320, 300); + evas_object_resize(win, 320 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(win); } @@ -616,7 +620,8 @@ test_toolbar5(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ elm_box_pack_end(bx, tb); evas_object_show(tb); - evas_object_resize(win, 320, 300); + evas_object_resize(win, 320 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(win); } @@ -720,7 +725,8 @@ test_toolbar_vertical(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void elm_box_pack_end(bx, tb); evas_object_show(tb); - evas_object_resize(win, 320, 300); + evas_object_resize(win, 320 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(win); } @@ -825,7 +831,8 @@ test_toolbar6(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ elm_box_pack_end(bx, tb); evas_object_show(tb); - evas_object_resize(win, 320, 300); + evas_object_resize(win, 320 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(win); } @@ -964,7 +971,8 @@ test_toolbar7(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ elm_box_pack_end(bx, tb); evas_object_show(tb); - evas_object_resize(win, 420, 250); + evas_object_resize(win, 420 * elm_config_scale_get(), + 250 * elm_config_scale_get()); evas_object_show(win); } @@ -1054,7 +1062,8 @@ test_toolbar8(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ elm_box_pack_end(bx, tb); evas_object_show(tb); - evas_object_resize(win, 420, 250); + evas_object_resize(win, 420 * elm_config_scale_get(), + 250 * elm_config_scale_get()); evas_object_show(win); } @@ -1309,6 +1318,7 @@ test_toolbar_focus(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e _test_toolbar_focus_disable_item_btn_cb, it_0); - evas_object_resize(win, 420, 200); + evas_object_resize(win, 420 * elm_config_scale_get(), + 200 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_tooltip.c b/src/bin/elementary/test_tooltip.c index 3615886478..d7ddf0f768 100644 --- a/src/bin/elementary/test_tooltip.c +++ b/src/bin/elementary/test_tooltip.c @@ -631,7 +631,8 @@ test_tooltip(void *data EINA_UNUSED, elm_box_pack_end(bx, lst); evas_object_show(lst); - evas_object_resize(win, 320, 580); + evas_object_resize(win, 320 * elm_config_scale_get(), + 580 * elm_config_scale_get()); evas_object_show(win); } @@ -727,7 +728,8 @@ test_tooltip2(void *data EINA_UNUSED, elm_box_pack_end(bx, gl); evas_object_show(gl); - evas_object_resize(win, 320, 480); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } @@ -755,7 +757,8 @@ test_tooltip3(void *data EINA_UNUSED, evas_object_show(rect); evas_object_layer_set(rect, 100); - evas_object_resize(win, 300, 300); + evas_object_resize(win, 300 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(win); } @@ -768,8 +771,6 @@ test_tooltip4(void *data EINA_UNUSED, win = elm_win_util_standard_add("tooltip4", "Tooltip 4"); elm_win_autodel_set(win, EINA_TRUE); - evas_object_resize(win, 300, 300); - evas_object_show(win); bt = elm_button_add(win); elm_object_tooltip_text_set(bt, "Tooltip!!!!!!!!!!!!!!!!!!"); @@ -814,4 +815,8 @@ test_tooltip4(void *data EINA_UNUSED, evas_object_resize(bt, 30, 30); evas_object_move(bt, 135, 255); evas_object_show(bt); + + evas_object_resize(win, 300 * elm_config_scale_get(), + 300 * elm_config_scale_get()); + evas_object_show(win); } diff --git a/src/bin/elementary/test_transit.c b/src/bin/elementary/test_transit.c index 17b3911d39..043899a77b 100644 --- a/src/bin/elementary/test_transit.c +++ b/src/bin/elementary/test_transit.c @@ -386,7 +386,8 @@ test_transit(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i evas_object_show(bt); evas_object_smart_callback_add(bt, "clicked", _transit_wipe, NULL); - evas_object_resize(win, 300, 300); + evas_object_resize(win, 300 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(win); } @@ -414,7 +415,8 @@ test_transit_resizing(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void evas_object_smart_callback_add(bt, "clicked", _transit_resizing, rev_bt); - evas_object_resize(win, 400, 400); + evas_object_resize(win, 400 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } @@ -447,7 +449,8 @@ test_transit_flip(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev evas_object_data_set(bt, "revert", rev_bt); evas_object_data_set(bt2, "revert", rev_bt); - evas_object_resize(win, 400, 400); + evas_object_resize(win, 400 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); evas_object_smart_callback_add(bt, "clicked", _transit_flip, bt2); @@ -478,7 +481,8 @@ test_transit_zoom(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev evas_object_smart_callback_add(bt, "clicked", _transit_zoom, rev_bt); - evas_object_resize(win, 300, 300); + evas_object_resize(win, 300 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(win); } @@ -524,7 +528,8 @@ test_transit_blend(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e evas_object_data_set(bt, "revert", rev_bt); evas_object_data_set(bt2, "revert", rev_bt); - evas_object_resize(win, 300, 400); + evas_object_resize(win, 300 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); evas_object_smart_callback_add(bt, "clicked", _transit_blend, bt2); @@ -573,7 +578,8 @@ test_transit_fade(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev evas_object_data_set(bt, "revert", rev_bt); evas_object_data_set(bt2, "revert", rev_bt); - evas_object_resize(win, 300, 400); + evas_object_resize(win, 300 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); evas_object_smart_callback_add(bt, "clicked", _transit_fade, bt2); @@ -600,7 +606,8 @@ test_transit_resizable_flip(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED evas_object_move(bt2, 50, 100); evas_object_resize(bt2, 300, 200); - evas_object_resize(win, 400, 400); + evas_object_resize(win, 400 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); evas_object_smart_callback_add(bt, "clicked", _transit_resizable_flip, bt2); @@ -644,7 +651,8 @@ test_transit_custom(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void * evas_object_show(bt); evas_object_smart_callback_add(bt, "clicked", _transit_revert, trans); - evas_object_resize(win, 400, 400); + evas_object_resize(win, 400 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } @@ -714,7 +722,8 @@ test_transit_chain(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e elm_transit_objects_final_state_keep_set(trans4, EINA_TRUE); elm_transit_chain_transit_add(trans3, trans4); - evas_object_resize(win, 400, 400); + evas_object_resize(win, 400 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_video.c b/src/bin/elementary/test_video.c index 0dfca3e7ea..c92d15c088 100644 --- a/src/bin/elementary/test_video.c +++ b/src/bin/elementary/test_video.c @@ -53,6 +53,7 @@ test_video(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf elm_table_pack(tb, bt, 0, 0, 1, 1); evas_object_show(bt); - evas_object_resize(win, 800, 500); + evas_object_resize(win, 800 * elm_config_scale_get(), + 500 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_weather.c b/src/bin/elementary/test_weather.c index 332770bb4e..488c938671 100644 --- a/src/bin/elementary/test_weather.c +++ b/src/bin/elementary/test_weather.c @@ -163,6 +163,7 @@ test_weather(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i evas_object_show(lbl); #endif - evas_object_resize(win, 244, 388); + evas_object_resize(win, 244 * elm_config_scale_get(), + 388 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_web.c b/src/bin/elementary/test_web.c index 5cc4b85169..b1a06bb9c4 100644 --- a/src/bin/elementary/test_web.c +++ b/src/bin/elementary/test_web.c @@ -631,7 +631,8 @@ test_web(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info elm_web_window_create_hook_set(web, _new_window_hook, wt); - evas_object_resize(win, 320, 480); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } @@ -688,6 +689,7 @@ test_web_ui(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in "<!doctype html><body>Hello, WebKit/Efl</body>", NULL, NULL); - evas_object_resize(win, 320, 480); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_win_dialog.c b/src/bin/elementary/test_win_dialog.c index 05046697b3..e13940892f 100644 --- a/src/bin/elementary/test_win_dialog.c +++ b/src/bin/elementary/test_win_dialog.c @@ -163,6 +163,7 @@ test_win_dialog(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even elm_box_pack_end(box, bt); evas_object_show(bt); - evas_object_resize(win, 400, 400); + evas_object_resize(win, 400 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_win_inline.c b/src/bin/elementary/test_win_inline.c index ad040dc8c0..a5e5c8128d 100644 --- a/src/bin/elementary/test_win_inline.c +++ b/src/bin/elementary/test_win_inline.c @@ -256,6 +256,7 @@ test_win_inline(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even create_handles(elm_win_inlined_image_object_get(win3)); - evas_object_resize(win, 400, 400); + evas_object_resize(win, 400 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_win_modal.c b/src/bin/elementary/test_win_modal.c index 2a82a38d9a..680be2e71e 100644 --- a/src/bin/elementary/test_win_modal.c +++ b/src/bin/elementary/test_win_modal.c @@ -78,6 +78,7 @@ test_win_modal(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_U /* make the window modal */ elm_win_modal_set(win, EINA_TRUE); - evas_object_resize(win, 250, 150); + evas_object_resize(win, 250 * elm_config_scale_get(), + 150 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_win_plug.c b/src/bin/elementary/test_win_plug.c index b94f324c10..4066f179ed 100644 --- a/src/bin/elementary/test_win_plug.c +++ b/src/bin/elementary/test_win_plug.c @@ -213,6 +213,7 @@ test_win_plug(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UN create_handles(elm_plug_image_object_get(plug)); - evas_object_resize(win, 400, 600); + evas_object_resize(win, 400 * elm_config_scale_get(), + 600 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_win_socket.c b/src/bin/elementary/test_win_socket.c index 664f097bde..09a9921922 100644 --- a/src/bin/elementary/test_win_socket.c +++ b/src/bin/elementary/test_win_socket.c @@ -173,7 +173,8 @@ test_win_socket(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even elm_box_pack_end(bx, lb); evas_object_show(lb); - evas_object_resize(win, 320, 300); + evas_object_resize(win, 320 * elm_config_scale_get(), + 300 * elm_config_scale_get()); evas_object_show(bx); evas_object_show(win); @@ -194,7 +195,8 @@ test_win_socket(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even fill(win_socket, EINA_TRUE); - evas_object_resize(win_socket, 400, 600); + evas_object_resize(win_socket, 400 * elm_config_scale_get(), + 600 * elm_config_scale_get()); evas_object_show(win_socket); evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _win_del, diff --git a/src/bin/elementary/test_win_stack.c b/src/bin/elementary/test_win_stack.c index 6bff88efc4..e3ca2b943e 100644 --- a/src/bin/elementary/test_win_stack.c +++ b/src/bin/elementary/test_win_stack.c @@ -134,6 +134,7 @@ test_win_stack(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event elm_box_pack_end(bx, bt); evas_object_show(bt); - evas_object_resize(win, 320, 480); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_win_state.c b/src/bin/elementary/test_win_state.c index 1b75d3d835..b29969b4c8 100644 --- a/src/bin/elementary/test_win_state.c +++ b/src/bin/elementary/test_win_state.c @@ -69,7 +69,8 @@ static void my_bt_38_massive(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Evas_Object *win = data; - evas_object_resize(win, 4000, 2400); + evas_object_resize(win, 4000 * elm_config_scale_get(), + 2400 * elm_config_scale_get()); } static void @@ -677,7 +678,8 @@ test_win_state(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event elm_box_pack_end(bx, tb); - evas_object_resize(win, 280, 400); + evas_object_resize(win, 280 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } @@ -826,6 +828,7 @@ test_win_state2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even elm_box_pack_end(bx, bx2); evas_object_show(bx2); - evas_object_resize(win, 320, 480); + evas_object_resize(win, 320 * elm_config_scale_get(), + 480 * elm_config_scale_get()); evas_object_show(win); } diff --git a/src/bin/elementary/test_win_wm_rotation.c b/src/bin/elementary/test_win_wm_rotation.c index 1a37961310..77ea23d7e3 100644 --- a/src/bin/elementary/test_win_wm_rotation.c +++ b/src/bin/elementary/test_win_wm_rotation.c @@ -108,6 +108,7 @@ test_win_wm_rotation(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void bx = elm_box_add(win); evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); + evas_object_show(bx); lb = elm_label_add(win); elm_object_text_set(lb, "<b>Window manager rotation test</b>"); @@ -208,7 +209,7 @@ test_win_wm_rotation(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void evas_object_smart_callback_add(win, "delete,request", _win_del_cb, NULL); - evas_object_resize(win, 480, 400); - evas_object_show(bx); + evas_object_resize(win, 480 * elm_config_scale_get(), + 400 * elm_config_scale_get()); evas_object_show(win); } |