From 402351a84fdec57e34836553889a80d24d097caa Mon Sep 17 00:00:00 2001 From: Hyojung Jo Date: Tue, 15 Dec 2015 14:40:07 +0900 Subject: [PATCH] Apply multiscale Change-Id: I39029bd04c7eac0e422e129a5351b63d3645c855 Signed-off-by: Hyojung Jo --- res/favorite-theme.edc | 1 + res/favorite.edc | 1 + src/common/utils.c | 10 ++++++---- src/main.c | 2 ++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/res/favorite-theme.edc b/res/favorite-theme.edc index 9cd2ad9..3567946 100644 --- a/res/favorite-theme.edc +++ b/res/favorite-theme.edc @@ -17,6 +17,7 @@ #include "../include/define.h" collections { + base_scale, 2.0; #include "widgets/gengrid_tv.edc" #include "widgets/gengrid_movie.edc" #include "widgets/gengrid_gallery.edc" diff --git a/res/favorite.edc b/res/favorite.edc index 1705237..14d40a2 100644 --- a/res/favorite.edc +++ b/res/favorite.edc @@ -17,6 +17,7 @@ #include "../include/define.h" collections { + base_scale, 2.0; group { name, GRP_VIEW_BASE; parts { diff --git a/src/common/utils.c b/src/common/utils.c index 39628ed..9552034 100644 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -96,8 +96,8 @@ Evas_Object *utils_add_gengrid(Evas_Object *parent, elm_gengrid_horizontal_set(grid, EINA_TRUE); elm_gengrid_align_set(grid, 0.0, 0.0); elm_gengrid_select_mode_set(grid, ELM_OBJECT_SELECT_MODE_ALWAYS); - elm_gengrid_item_size_set(grid, elm_config_scale_get() * item_size_x, - elm_config_scale_get() * item_size_y); + elm_gengrid_item_size_set(grid, ELM_SCALE_SIZE(item_size_x), + ELM_SCALE_SIZE(item_size_y)); elm_scroller_policy_set(grid, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); @@ -122,7 +122,8 @@ Evas_Object *utils_add_box(Evas_Object *parent, const char *part, } elm_box_horizontal_set(box, horizontal); - elm_box_padding_set(box, padding_h, padding_v); + elm_box_padding_set(box, ELM_SCALE_SIZE(padding_h), + ELM_SCALE_SIZE(padding_v)); evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -180,7 +181,8 @@ Evas_Object *utils_add_table(Evas_Object *parent, const char *part, return NULL; } - elm_table_padding_set(table, padding_x, padding_y); + elm_table_padding_set(table, ELM_SCALE_SIZE(padding_x), + ELM_SCALE_SIZE(padding_y)); evas_object_show(table); if (part) diff --git a/src/main.c b/src/main.c index 89b2aa6..3b0226f 100644 --- a/src/main.c +++ b/src/main.c @@ -44,6 +44,8 @@ static bool _create(void *data) } ad = data; + elm_app_base_scale_set(APP_BASE_SCALE); + elm_theme_overlay_add(NULL, THEMEFILE); win = utils_add_window(ad->name); -- 2.7.4