seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=05436b2c6875174e1c739cffcbbecbf72cec20a6
commit 05436b2c6875174e1c739cffcbbecbf72cec20a6
Author: Daniel Juyung Seo <seojuyu...@gmail.com>
Date: Thu Nov 13 00:08:37 2014 +0900
test: Use ELM_SCALE_SIZE instead of elm_config_scale_get().
Newly introduced macro ELM_SCALE_SIZE at 1.12 makes your app more
scalable.
---
src/bin/test_access.c | 8 +++-----
src/bin/test_dnd.c | 6 ++----
src/bin/test_gengrid.c | 39 +++++++++++++--------------------------
src/bin/test_genlist.c | 10 ++++++----
src/bin/test_progressbar.c | 14 +++++++-------
5 files changed, 31 insertions(+), 46 deletions(-)
diff --git a/src/bin/test_access.c b/src/bin/test_access.c
index e15122a..ae567ca 100644
--- a/src/bin/test_access.c
+++ b/src/bin/test_access.c
@@ -85,9 +85,7 @@ Evas_Object *gl_access_content_full_get(void *data
EINA_UNUSED, Evas_Object *obj
if (strcmp(part, "elm.swallow.content")) return NULL;
grid = elm_gengrid_add(obj);
- elm_gengrid_item_size_set(grid,
- elm_config_scale_get() * 100,
- elm_config_scale_get() * 100);
+ elm_gengrid_item_size_set(grid, ELM_SCALE_SIZE(100), ELM_SCALE_SIZE(100));
elm_gengrid_horizontal_set(grid, EINA_FALSE);
elm_gengrid_reorder_mode_set(grid, EINA_TRUE);
evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -109,8 +107,8 @@ Evas_Object *gl_access_content_full_get(void *data
EINA_UNUSED, Evas_Object *obj
}
elm_gengrid_item_class_free(gic);
- evas_object_size_hint_min_set(grid, 300 * elm_config_scale_get(),
- 150 * elm_config_scale_get());
+ evas_object_size_hint_min_set(grid,
+ ELM_SCALE_SIZE(300), ELM_SCALE_SIZE(150));
return grid;
}
diff --git a/src/bin/test_dnd.c b/src/bin/test_dnd.c
index d799a04..05fff6f 100644
--- a/src/bin/test_dnd.c
+++ b/src/bin/test_dnd.c
@@ -938,8 +938,7 @@ test_dnd_genlist_gengrid(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED, v
Evas_Object *grid = elm_gengrid_add(win);
evas_object_smart_callback_add(win, "delete,request", _win_del, grid);
elm_gengrid_item_size_set(grid,
- elm_config_scale_get() * 150,
- elm_config_scale_get() * 150);
+ ELM_SCALE_SIZE(150), ELM_SCALE_SIZE(150));
elm_gengrid_horizontal_set(grid, EINA_FALSE);
elm_gengrid_reorder_mode_set(grid, EINA_FALSE);
elm_gengrid_multi_select_set(grid, EINA_TRUE); /* We allow multi drag
*/
@@ -1082,8 +1081,7 @@ test_dnd_multi_features(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED, vo
Evas_Object *grid = elm_gengrid_add(bxx);
evas_object_smart_callback_add(win, "delete,request", _win_del, grid);
elm_gengrid_item_size_set(grid,
- elm_config_scale_get() * 100,
- elm_config_scale_get() * 100);
+ ELM_SCALE_SIZE(100), ELM_SCALE_SIZE(100));
elm_gengrid_horizontal_set(grid, EINA_FALSE);
elm_gengrid_reorder_mode_set(grid, EINA_FALSE);
elm_gengrid_multi_select_set(grid, EINA_TRUE); /* We allow multi drag
*/
diff --git a/src/bin/test_gengrid.c b/src/bin/test_gengrid.c
index 4bea62e..50572ec 100644
--- a/src/bin/test_gengrid.c
+++ b/src/bin/test_gengrid.c
@@ -354,9 +354,7 @@ create_gengrid(Evas_Object *obj, int items)
char buf[PATH_MAX];
grid = elm_gengrid_add(obj);
- elm_gengrid_item_size_set(grid,
- elm_config_scale_get() * 200,
- elm_config_scale_get() * 150);
+ elm_gengrid_item_size_set(grid, ELM_SCALE_SIZE(200), ELM_SCALE_SIZE(150));
evas_object_smart_callback_add(grid, "selected", grid_selected, NULL);
evas_object_smart_callback_add(grid, "unselected", grid_unselected, NULL);
evas_object_smart_callback_add(grid, "clicked,double", grid_double_clicked,
NULL);
@@ -762,9 +760,7 @@ _size_changed(void *data, Evas_Object *obj, void
*event_info EINA_UNUSED)
{
Evas_Object *grid = data;
int size = elm_spinner_value_get(obj);
- elm_gengrid_item_size_set(grid,
- elm_config_scale_get() * size,
- elm_config_scale_get() * size);
+ elm_gengrid_item_size_set(grid, ELM_SCALE_SIZE(size), ELM_SCALE_SIZE(size));
}
void
@@ -781,9 +777,7 @@ test_gengrid2(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_
evas_object_show(bx);
grid = elm_gengrid_add(win);
- elm_gengrid_item_size_set(grid,
- elm_config_scale_get() * 150,
- elm_config_scale_get() * 150);
+ elm_gengrid_item_size_set(grid, ELM_SCALE_SIZE(150), ELM_SCALE_SIZE(150));
elm_gengrid_multi_select_set(grid, EINA_FALSE);
evas_object_smart_callback_add(grid, "selected", grid_selected, NULL);
evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -895,12 +889,8 @@ test_gengrid3(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_
grid = elm_gengrid_add(win);
evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, grid);
- elm_gengrid_item_size_set(grid,
- elm_config_scale_get() * 150,
- elm_config_scale_get() * 150);
- elm_gengrid_group_item_size_set(grid,
- elm_config_scale_get() * 31,
- elm_config_scale_get() * 31);
+ elm_gengrid_item_size_set(grid, ELM_SCALE_SIZE(150), ELM_SCALE_SIZE(150));
+ elm_gengrid_group_item_size_set(grid, ELM_SCALE_SIZE(31),
ELM_SCALE_SIZE(31));
elm_gengrid_multi_select_set(grid, EINA_TRUE);
evas_object_smart_callback_add(grid, "selected", grid_selected, NULL);
evas_object_smart_callback_add(grid, "clicked,double", grid_double_clicked,
NULL);
@@ -967,9 +957,7 @@ _gengrid_create(Evas_Object *obj, int items, const char
*style)
{
if (!obj) return NULL;
grid = elm_gengrid_add(obj);
- elm_gengrid_item_size_set(grid,
- elm_config_scale_get() * 150,
- elm_config_scale_get() * 150);
+ elm_gengrid_item_size_set(grid, ELM_SCALE_SIZE(150),
ELM_SCALE_SIZE(150));
evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(grid, EVAS_HINT_FILL, EVAS_HINT_FILL);
}
@@ -1167,7 +1155,6 @@ _show_clicked_cb(void *data, Evas_Object *obj
EINA_UNUSED, void *event_info EINA
static Item_Data ti[10000];
int i, n;
char buf[PATH_MAX];
- double scale = elm_config_scale_get();
if (!data) return;
@@ -1180,8 +1167,8 @@ _show_clicked_cb(void *data, Evas_Object *obj
EINA_UNUSED, void *event_info EINA
elm_win_autodel_set(win, EINA_TRUE);
grid = elm_gengrid_add(win);
- elm_gengrid_item_size_set(grid, 150 * scale, 150 * scale);
- elm_gengrid_group_item_size_set(grid, 31 * scale, 31 * scale);
+ elm_gengrid_item_size_set(grid, ELM_SCALE_SIZE(150), ELM_SCALE_SIZE(150));
+ elm_gengrid_group_item_size_set(grid, ELM_SCALE_SIZE(31),
ELM_SCALE_SIZE(31));
if (sd->winmode == 0)
elm_gengrid_horizontal_set(grid, EINA_TRUE);
else if (sd->winmode == 1)
@@ -1514,7 +1501,7 @@ test_gengrid5(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_
elm_object_focus_set(en, EINA_TRUE);
grid = elm_gengrid_add(bx);
- elm_gengrid_item_size_set(grid, elm_config_scale_get() * 200,
elm_config_scale_get() * 150);
+ elm_gengrid_item_size_set(grid, ELM_SCALE_SIZE(200), ELM_SCALE_SIZE(150));
evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(grid, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_gengrid_select_mode_set(grid, ELM_OBJECT_SELECT_MODE_ALWAYS);
@@ -1575,8 +1562,8 @@ test_gengrid_speed(void *data EINA_UNUSED, Evas_Object
*obj EINA_UNUSED, void *e
api->grid = create_gengrid(win, 5000);
evas_object_size_hint_min_set(api->grid, 600, 600);
elm_gengrid_item_size_set(api->grid,
- elm_config_scale_get() * 30,
- elm_config_scale_get() * 36);
+ 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);
@@ -1697,8 +1684,8 @@ test_gengrid_focus(void *data EINA_UNUSED,
gengrid = elm_gengrid_add(bx);
elm_gengrid_item_size_set(gengrid,
- elm_config_scale_get() * 150,
- elm_config_scale_get() * 150);
+ ELM_SCALE_SIZE(150),
+ ELM_SCALE_SIZE(150));
evas_object_size_hint_weight_set(gengrid, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(gengrid, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_pack_end(bx, gengrid);
diff --git a/src/bin/test_genlist.c b/src/bin/test_genlist.c
index e2ddcc6..1bd3a8f 100644
--- a/src/bin/test_genlist.c
+++ b/src/bin/test_genlist.c
@@ -170,8 +170,9 @@ Evas_Object *gl_content_full_get(void *data EINA_UNUSED,
Evas_Object *obj, const
ic = elm_icon_add(bx);
elm_icon_standard_set(ic, "home");
- evas_object_size_hint_min_set(ic, 32 * elm_config_scale_get(),
- 32 * elm_config_scale_get());
+ evas_object_size_hint_min_set(ic,
+ ELM_SCALE_SIZE(32),
+ ELM_SCALE_SIZE(32));
evas_object_size_hint_align_set(ic, 0.5, EVAS_HINT_FILL);
evas_object_show(ic);
elm_box_pack_end(bx, ic);
@@ -193,8 +194,9 @@ Evas_Object *gl_content_full_get(void *data EINA_UNUSED,
Evas_Object *obj, const
elm_box_pack_end(bx, ck);
elm_layout_content_set(fr, NULL, bx);
- evas_object_size_hint_min_set(fr, 100 * elm_config_scale_get(),
- 100 * elm_config_scale_get());
+ evas_object_size_hint_min_set(fr,
+ ELM_SCALE_SIZE(100),
+ ELM_SCALE_SIZE(100));
return fr;
}
diff --git a/src/bin/test_progressbar.c b/src/bin/test_progressbar.c
index c5b7e62..91282c0 100644
--- a/src/bin/test_progressbar.c
+++ b/src/bin/test_progressbar.c
@@ -149,7 +149,7 @@ test_progressbar(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *eve
elm_object_part_content_set(pb, "icon", ic1);
elm_progressbar_inverted_set(pb, EINA_TRUE);
elm_progressbar_unit_format_set(pb, "%1.1f units");
- elm_progressbar_span_size_set(pb, elm_config_scale_get() * 200);
+ elm_progressbar_span_size_set(pb, ELM_SCALE_SIZE(200));
evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, 0.5);
elm_box_pack_end(bx, pb);
@@ -177,7 +177,7 @@ test_progressbar(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *eve
elm_progressbar_horizontal_set(pb, EINA_FALSE);
evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, 0.5);
- elm_progressbar_span_size_set(pb, elm_config_scale_get() * 80);
+ elm_progressbar_span_size_set(pb, ELM_SCALE_SIZE(80));
elm_progressbar_pulse_set(pb, EINA_TRUE);
elm_progressbar_unit_format_set(pb, NULL);
elm_object_text_set(pb, "Infinite bounce");
@@ -195,7 +195,7 @@ test_progressbar(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *eve
elm_object_part_content_set(pb, "icon", ic2);
elm_progressbar_inverted_set(pb, EINA_TRUE);
elm_progressbar_unit_format_set(pb, "%1.2f%%");
- elm_progressbar_span_size_set(pb, elm_config_scale_get() * 200);
+ elm_progressbar_span_size_set(pb, ELM_SCALE_SIZE(200));
evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_pack_end(hbx, pb);
@@ -336,7 +336,7 @@ test_progressbar2(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *ev
elm_object_text_set(pb, "Style: default");
evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, 0.5);
- elm_progressbar_span_size_set(pb, elm_config_scale_get() * 200);
+ elm_progressbar_span_size_set(pb, ELM_SCALE_SIZE(200));
elm_box_pack_end(bx, pb);
evas_object_show(pb);
pd->pb1 = pb;
@@ -346,7 +346,7 @@ test_progressbar2(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *ev
elm_object_text_set(pb, "Style: double");
evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, 0.5);
- elm_progressbar_span_size_set(pb, elm_config_scale_get() * 200);
+ elm_progressbar_span_size_set(pb, ELM_SCALE_SIZE(200));
elm_box_pack_end(bx, pb);
evas_object_show(pb);
pd->pb2 = pb;
@@ -356,7 +356,7 @@ test_progressbar2(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *ev
elm_object_text_set(pb, "Style: double 2");
evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, 0.5);
- elm_progressbar_span_size_set(pb, elm_config_scale_get() * 200);
+ elm_progressbar_span_size_set(pb, ELM_SCALE_SIZE(200));
elm_box_pack_end(bx, pb);
evas_object_show(pb);
pd->pb3 = pb;
@@ -367,7 +367,7 @@ test_progressbar2(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *ev
elm_object_text_set(pb, "Style: Vertical");
evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, 0.5);
- elm_progressbar_span_size_set(pb, elm_config_scale_get() * 200);
+ elm_progressbar_span_size_set(pb, ELM_SCALE_SIZE(200));
elm_box_pack_end(bx, pb);
evas_object_show(pb);
pd->pb4 = pb;
--
