apply multi scale

Change-Id: I0e54aa0f5f86cd382511a07e1823aea47daa598f
Signed-off-by: Soohye Shin <soohye.shin@samsung.com>

diff --git a/edje/home-theme.edc b/edje/home-theme.edc
index e46fb1b3515cac923bd9fc42ece51b6e6c5430b9..443c116314b17bc32b325f318ece8d4833224b18 100644 (file)
--- a/edje/home-theme.edc
+++ b/edje/home-theme.edc
@@ -17,6 +17,7 @@
 #include "../include/defs.h"
 
 collections {
+       base_scale, 2.0;
        #include "widget/label.edc"
        #include "widget/gengrid.edc"
        #include "widget/entry.edc"

diff --git a/edje/home.edc b/edje/home.edc
index 456c1a4653ba20524de50e481db1f38000e0e850..ca4fefb46d4834730db60bdb51fb7e8f3d5f0a82 100644 (file)
--- a/edje/home.edc
+++ b/edje/home.edc
@@ -17,6 +17,7 @@
 #include "../include/defs.h"
 
 collections {
+       base_scale, 2.0;
        #include "view/baritem.edc"
        #include "view/home.edc"
        #include "view/recent.edc"

diff --git a/edje/view/recent.edc b/edje/view/recent.edc
index c4448a2cbd9c36fc54327f0d0fdbcdfbecd413ea..de7494b2a9f9945212dd19ca87f2f7bb47c11964 100644 (file)
--- a/edje/view/recent.edc
+++ b/edje/view/recent.edc
@@ -47,6 +47,7 @@ group {
                }
                part {
                        name, "clip";
+                       scale, 1;
                        type, RECT;
                        description {
                                state, "default" 0.0;

diff --git a/src/main.c b/src/main.c
index 5817ac7cfd25bb55b88311b67e29902331bcc416..9a82cb7696add7a5b9f8f166facf7e301da37809 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -143,6 +143,7 @@ static bool _create(void *user_data)
 
        ad = user_data;
 
+       elm_app_base_scale_set(APP_BASE_SCALE);
        elm_theme_overlay_add(NULL, THEMEFILE);
        elm_config_focus_move_policy_set(ELM_FOCUS_MOVE_POLICY_CLICK);
 

diff --git a/src/view/view_action_menu.c b/src/view/view_action_menu.c
index 9ba2acf6efd45fcbc35f21afa763e2f1e01af97a..d901fcc58b5a4e5deafb15aa805b9eaf0be01c5e 100644 (file)
--- a/src/view/view_action_menu.c
+++ b/src/view/view_action_menu.c
@@ -343,7 +343,7 @@ static bool _add_base(struct _priv *priv)
                _ERR("failed to add table");
                return false;
        }
-       elm_table_padding_set(tbl, elm_config_scale_get() * 1, 0);
+       elm_table_padding_set(tbl, ELM_SCALE_SIZE(1), 0);
        priv->tbl = tbl;
 
        return true;

diff --git a/src/view/view_photo.c b/src/view/view_photo.c
index 0a134216e4bc8129b4fcefa38658ff562c02e043..0fdc76166bf66217e0afc74040be0e9cf654c08d 100644 (file)
--- a/src/view/view_photo.c
+++ b/src/view/view_photo.c
@@ -252,8 +252,8 @@ static Evas_Object *_add_photo_grid(struct _priv *priv)
        elm_gengrid_select_mode_set(grid, ELM_OBJECT_SELECT_MODE_ALWAYS);
        elm_gengrid_multi_select_set(grid, EINA_FALSE);
        elm_gengrid_item_size_set(grid,
-                       GENGRID_ITEM_SIZE * elm_config_scale_get(),
-                       GENGRID_ITEM_SIZE * elm_config_scale_get());
+                       ELM_SCALE_SIZE(GENGRID_ITEM_SIZE),
+                       ELM_SCALE_SIZE(GENGRID_ITEM_SIZE));
        elm_gengrid_horizontal_set(grid, EINA_TRUE);
        elm_scroller_policy_set(grid, ELM_SCROLLER_POLICY_OFF,
                        ELM_SCROLLER_POLICY_OFF);

diff --git a/src/view/view_recent.c b/src/view/view_recent.c
index 2321cac73e9c72b7e0a4f2fbf83d4d4e3aeb7743..8a0273339df1872247438e6e00fef2b3626be93f 100644 (file)
--- a/src/view/view_recent.c
+++ b/src/view/view_recent.c
@@ -447,7 +447,7 @@ static void _load_recent(struct _priv *priv)
        elm_object_content_set(scr, box);
        elm_object_part_content_set(priv->base, PART_RECENT_CONTENTS, scr);
        elm_object_part_text_set(priv->base, PART_RECENT_NO_CONTENTS, "");
-       elm_box_padding_set(box, PADDING_BOX * elm_config_scale_get(), 0);
+       elm_box_padding_set(box, ELM_SCALE_SIZE(PADDING_BOX), 0);
 
        _add_delete_btn(priv, IMAGE_RECENT_DELETE_NOR, IMAGE_RECENT_DELETE_FOC,
                        INPUT_HANDLER_TYPE_DELETE);

diff --git a/src/view/view_user_edit.c b/src/view/view_user_edit.c
index a7a62c3d8aa9059db83cdbfe4aed2030985ecf5d..8bf533fe45d64c98e7e8426ae3dfe23ed543dad4 100644 (file)
--- a/src/view/view_user_edit.c
+++ b/src/view/view_user_edit.c
@@ -345,8 +345,8 @@ static void _add_icon_list(struct _priv *priv)
 
        evas_object_geometry_get(priv->photo, &x, &y, &w, &h);
        evas_object_move(ctxpopup,
-                       (x + w + CTXPOPUP_X) * elm_config_scale_get(),
-                       (y + CTXPOPUP_Y) * elm_config_scale_get());
+                       ELM_SCALE_SIZE(x + w + CTXPOPUP_X),
+                       ELM_SCALE_SIZE(y + CTXPOPUP_Y));
 
        table = utils_add_table(ly, true, PART_USER_EDIT_ICON_LIST);
        if (!table) {
@@ -354,8 +354,7 @@ static void _add_icon_list(struct _priv *priv)
                evas_object_del(ctxpopup);
                return;
        }
-       elm_table_padding_set(table, elm_config_scale_get() * 1,
-                       elm_config_scale_get() * 1);
+       elm_table_padding_set(table, ELM_SCALE_SIZE(1), ELM_SCALE_SIZE(1));
        evas_object_size_hint_weight_set(table, EVAS_HINT_EXPAND,
                        EVAS_HINT_EXPAND);