Apply the multiscale

Change-Id: Icf0762356682d0ae3fb74c6d7257c3bffc4ceb54
Signed-off-by: Hyojung Jo <hj903.jo@samsung.com>

diff --git a/res/apps-theme.edc b/res/apps-theme.edc
index bb9d3e8574450cffe8b93dba26650869cb1a6137..d987c1a7d6406fb3c10d8c6b8ff1d22605cd0de7 100644 (file)
--- a/res/apps-theme.edc
+++ b/res/apps-theme.edc
@@ -17,6 +17,7 @@
 #include "../include/define.h"
 
 collections {
+       base_scale, 2.0;
        #include "widget/button.edc"
        #include "widget/gengrid.edc"
        #include "widget/ctxpopup.edc"

diff --git a/res/apps.edc b/res/apps.edc
index fa9e5dbac9e9856ff3c8beced7e4eba1d721128e..ba076f6aa4db950b9e956db10cda2dfb60c323f1 100644 (file)
--- a/res/apps.edc
+++ b/res/apps.edc
@@ -17,6 +17,7 @@
 #include "../include/define.h"
 
 collections {
+       base_scale, 2.0;
        #include "view/base.edc"
        #include "view/action_menu.edc"
 }

diff --git a/src/main.c b/src/main.c
index 708da0bba360b0a348881992d0e8ebc82373cbbb..2a1e4d38962868f1d402516858ad49d3b6dc75bf 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -18,6 +18,7 @@
 #include <Elementary.h>
 #include <viewmgr.h>
 #include <app_debug.h>
+#include <app_define.h>
 
 #include "define.h"
 #include "utils.h"
@@ -41,6 +42,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);

diff --git a/src/utils.c b/src/utils.c
index 7551665b0d1aca2ba3d55ef53365a0650f223ada..136eea85765b2efc4bf683fe89bd1bb22ab97586 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -90,7 +90,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_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
@@ -156,9 +157,8 @@ Evas_Object *utils_add_gengrid(Evas_Object *parent, Eina_Bool horizontal,
        elm_gengrid_horizontal_set(grid, horizontal);
        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() * width,
-                       elm_config_scale_get() * height);
+       elm_gengrid_item_size_set(grid, ELM_SCALE_SIZE(width),
+                       ELM_SCALE_SIZE(height));
        elm_scroller_policy_set(grid, ELM_SCROLLER_POLICY_OFF,
                        ELM_SCROLLER_POLICY_OFF);
 
@@ -181,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/view/view_action_menu.c b/src/view/view_action_menu.c
index acb30c3db5ca3d3cb5a299da1169325d23e03afe..c32151db4da46218ed7e9f9e51024f45dae53547 100644 (file)
--- a/src/view/view_action_menu.c
+++ b/src/view/view_action_menu.c
@@ -551,8 +551,9 @@ static bool _update_favorite_area(struct _priv *priv)
        cnt = eina_list_count(priv->fav_list);
 
        evas_object_size_hint_min_set(priv->grid,
-                       SIZE_FAVORITE_GRID_WIDTH * SIZE_FAVORITE_COL_MAX,
-                       _get_favorite_grid_height(cnt));
+                       ELM_SCALE_SIZE(SIZE_FAVORITE_GRID_WIDTH
+                               * SIZE_FAVORITE_COL_MAX),
+                       ELM_SCALE_SIZE(_get_favorite_grid_height(cnt)));
 
        elm_object_part_content_set(priv->contents_ly,
                        PART_FAVORITE, priv->grid);
@@ -629,7 +630,7 @@ static Evas_Object *_create(Evas_Object *win, void *data)
                goto end;
        }
 
-       elm_scroller_step_size_set(scr, 0, SIZE_SCROLLER_STEP);
+       elm_scroller_step_size_set(scr, 0, ELM_SCALE_SIZE(SIZE_SCROLLER_STEP));
 
        box = utils_add_box(scr, NULL, EINA_FALSE, 0.0, 0.0);
        if (!box) {

diff --git a/src/view/view_base.c b/src/view/view_base.c
index 4ebd35921bbf01c5b45d9322daff2e82166c7555..e41f3ba371a0d1387373bfc9dfb1e90772f05714 100644 (file)
--- a/src/view/view_base.c
+++ b/src/view/view_base.c
@@ -255,8 +255,8 @@ static bool _draw_sort_option(struct _priv *priv)
        }
 
        evas_object_geometry_get(priv->sort_btn, &x, &y, &w, &h);
-       evas_object_move(ctxpopup, (x + w / 2) * elm_config_scale_get(),
-                       y * elm_config_scale_get());
+       evas_object_move(ctxpopup, ELM_SCALE_SIZE(x + w / 2),
+                       ELM_SCALE_SIZE(y));
 
        priv->sort_popup = ctxpopup;