apply multi scale

Change-Id: Ifcaa44b791f47ae07435ef4791bd63eed36b556c
Signed-off-by: Hyunjee Kim <hj0426.kim@samsung.com>

diff --git a/include/define.h b/include/define.h
index a3708ce..e337227 100644 (file)
--- a/include/define.h
+++ b/include/define.h
@@ -122,4 +122,7 @@
 /* Transition */
 #define TRANSITION_FOCUS DECELERATE 0.20
 
+/* scale */
+#define APP_BASE_SCALE      2.0
+
 #endif /* __AIR_SETTINGS_DEFINE_H__ */

diff --git a/res/settings-theme.edc b/res/settings-theme.edc
index 118b9c3..bfbb15b 100644 (file)
--- a/res/settings-theme.edc
+++ b/res/settings-theme.edc
@@ -17,6 +17,7 @@
 #include "../include/define.h"
 
 collections {
+       base_scale: 2.0;
        #include "widget/button.edc"
        #include "widget/progressbar.edc"
        #include "widget/ctxpopup.edc"

diff --git a/res/settings.edc b/res/settings.edc
index 33b66bc..3cd017a 100644 (file)
--- a/res/settings.edc
+++ b/res/settings.edc
@@ -17,6 +17,7 @@
 #include "../include/define.h"
 
 collections {
+       base_scale: 2.0;
        #include "view/base.edc"
        #include "layout/picture.edc"
        #include "layout/channel.edc"

diff --git a/src/common/utils.c b/src/common/utils.c
index f63520d..391566c 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -63,7 +63,7 @@ Evas_Object *utils_add_box(Evas_Object *parent, const char *part,
        }
 
        elm_box_horizontal_set(box, horizontal);
-       elm_box_padding_set(box, pad_h, pad_v);
+       elm_box_padding_set(box, ELM_SCALE_SIZE(pad_h), ELM_SCALE_SIZE(pad_v));
        evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND,
                        EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -268,8 +268,8 @@ Evas_Object *utils_add_gengrid(Evas_Object *parent, Eina_Bool 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_SCALE_SIZE(width),
+                       ELM_SCALE_SIZE(height));
        elm_scroller_policy_set(grid, ELM_SCROLLER_POLICY_OFF,
                        ELM_SCROLLER_POLICY_OFF);
 

diff --git a/src/layout/layout_network.c b/src/layout/layout_network.c
index dd9f13a..8b4a389 100644 (file)
--- a/src/layout/layout_network.c
+++ b/src/layout/layout_network.c
@@ -172,10 +172,11 @@ static void _draw_network_type_popup(struct _priv *priv)
        }
 
        evas_object_geometry_get(priv->network_type_btn, &x, &y, &w, &h);
-       evas_object_move(ctxpopup, (x + w / 2) * elm_config_scale_get(),
-                       (y + h) * elm_config_scale_get());
-       evas_object_size_hint_min_set(ctxpopup, SIZE_NETWORK_CTXPOPUP_W,
-                       SIZE_NETWORK_CTXPOPUP_H);
+       evas_object_move(ctxpopup,
+                       ELM_SCALE_SIZE(x + w / 2),
+                       ELM_SCALE_SIZE(y + h));
+       evas_object_size_hint_min_set(ctxpopup, ELM_SCALE_SIZE(SIZE_NETWORK_CTXPOPUP_W),
+                       ELM_SCALE_SIZE(SIZE_NETWORK_CTXPOPUP_H));
 
        priv->network_type_popup = ctxpopup;
 

diff --git a/src/main.c b/src/main.c
index 6e98d16..c052d29 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -38,6 +38,7 @@ static bool _create(void *data)
        }
        ad = data;
 
+       elm_app_base_scale_set(APP_BASE_SCALE);
        elm_theme_overlay_add(NULL, THEMEFILE);
 
        win = elm_win_add(NULL, ad->name, ELM_WIN_BASIC);