Apply multi scale

Change-Id: I49da8256b69b90ffa2a94b2fff8fa5544c41841a
Signed-off-by: jinwoo.shin <jw0227.shin@samsung.com>

diff --git a/data/live-tv-theme.edc b/data/live-tv-theme.edc
index 1e7f622..8be3ca4 100644 (file)
--- a/data/live-tv-theme.edc
+++ b/data/live-tv-theme.edc
@@ -17,6 +17,7 @@
 #include "../include/define.h"
 
 collections {
+       base_scale: 2.0;
        #include "widget/button.edc"
        #include "widget/notify.edc"
 }

diff --git a/data/live-tv.edc b/data/live-tv.edc
index b5043e0..544a84a 100644 (file)
--- a/data/live-tv.edc
+++ b/data/live-tv.edc
@@ -17,6 +17,7 @@
 #include "../include/define.h"
 
 collections {
+       base_scale: 2.0;
        #include "view/channelinfo.edc"
        #include "view/channelnumber.edc"
        #include "view/error.edc"

diff --git a/src/layout_channelinfo_list.c b/src/layout_channelinfo_list.c
index d690586..be1e03b 100644 (file)
--- a/src/layout_channelinfo_list.c
+++ b/src/layout_channelinfo_list.c
@@ -223,7 +223,8 @@ static bool _draw_channel_layout(struct _priv *priv)
        if (!priv->next_channel)
                return false;
        elm_box_padding_set(priv->next_channel,
-                       CHANNEL_PADDING_X, CHANNEL_PADDING_Y);
+                       ELM_SCALE_SIZE(CHANNEL_PADDING_X),
+                       ELM_SCALE_SIZE(CHANNEL_PADDING_Y));
        elm_object_part_content_set(priv->base,
                        PART_CHANNELINFO_LIST_NEXT, priv->next_channel);
 
@@ -238,7 +239,8 @@ static bool _draw_channel_layout(struct _priv *priv)
        if (!priv->prev_channel)
                return false;
        elm_box_padding_set(priv->prev_channel,
-                       CHANNEL_PADDING_X, CHANNEL_PADDING_Y);
+                       ELM_SCALE_SIZE(CHANNEL_PADDING_X),
+                       ELM_SCALE_SIZE(CHANNEL_PADDING_Y));
        elm_object_part_content_set(priv->base,
                        PART_CHANNELINFO_LIST_PREV, priv->prev_channel);
 

diff --git a/src/layout_channelinfo_search.c b/src/layout_channelinfo_search.c
index 579c063..cf0a97f 100644 (file)
--- a/src/layout_channelinfo_search.c
+++ b/src/layout_channelinfo_search.c
@@ -125,7 +125,8 @@ static void _load_channel_list(struct _priv *priv, Eina_List *channel_list)
        evas_object_color_set(divider, DIVIDER_COLOR_R,
                        DIVIDER_COLOR_G, DIVIDER_COLOR_B, DIVIDER_COLOR_A);
        evas_object_size_hint_min_set(divider,
-                       DIVIDER_WIDTH, DIVIDER_HEIGHT);
+                       ELM_SCALE_SIZE(DIVIDER_WIDTH),
+                       ELM_SCALE_SIZE(DIVIDER_HEIGHT));
        evas_object_show(divider);
 
        elm_box_clear(priv->box);

diff --git a/src/main.c b/src/main.c
index 400f7a3..584ef87 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -19,6 +19,7 @@
 #include <viewmgr.h>
 #include <inputmgr.h>
 #include <app_debug.h>
+#include <app_define.h>
 #include <tzsh_tvsrv.h>
 #include <efl_util.h>
 #include <ui-gadget.h>
@@ -293,6 +294,7 @@ static bool _create(void *data)
 
        ad = data;
 
+       elm_app_base_scale_set(APP_BASE_SCALE);
        elm_theme_overlay_add(NULL, THEMEFILE);
 
        ad->tzsh = tzsh_create(TZSH_TOOLKIT_TYPE_EFL);

diff --git a/src/view_action_menu.c b/src/view_action_menu.c
index f9ab06e..65804e5 100644 (file)
--- a/src/view_action_menu.c
+++ b/src/view_action_menu.c
@@ -565,7 +565,9 @@ static bool _draw_action_area(struct _priv *priv)
                _ERR("failed to create action table");
                return false;
        }
-       elm_table_padding_set(table, BUTTON_BORDER, BUTTON_BORDER);
+       elm_table_padding_set(table,
+                       ELM_SCALE_SIZE(BUTTON_BORDER),
+                       ELM_SCALE_SIZE(BUTTON_BORDER));
        evas_object_show(table);
        elm_object_part_content_set(priv->menu, PART_MENU, table);
 
@@ -666,7 +668,7 @@ static bool _draw_favorite_area(struct _priv *priv)
                _ERR("failed to create favorite box");
                return false;
        }
-       elm_box_padding_set(box, 0, FAVORITE_PADDING_Y);
+       elm_box_padding_set(box, 0, ELM_SCALE_SIZE(FAVORITE_PADDING_Y));
        evas_object_show(box);
        elm_box_pack_end(priv->box, box);
 
@@ -760,7 +762,8 @@ static Evas_Object *_create(Evas_Object *win, void *data)
        elm_win_resize_object_add(win, base);
 
        scroller = util_add_scroller(base, NULL);
-       elm_scroller_step_size_set(scroller, 0, SCROLLER_STEP_SIZE);
+       elm_scroller_step_size_set(scroller,
+                       0, ELM_SCALE_SIZE(SCROLLER_STEP_SIZE));
 
        box = util_add_box(scroller, NULL);
        elm_box_align_set(box, 0.5, 0.0);

diff --git a/src/view_channelinfo.c b/src/view_channelinfo.c
index 08191e3..66af50e 100644 (file)
--- a/src/view_channelinfo.c
+++ b/src/view_channelinfo.c
@@ -28,7 +28,6 @@
 #include "layout_channelinfo_search.h"
 
 #define HIDE_DUR 10.0
-#define STATUS_BOX_PADDING 10
 
 struct _priv {
        Evas_Object *base;