use define for base scale

Change-Id: Ibd0a5ce936a339f3fcddb4d36dd0c1f76fb73eca

diff --git a/inc/indicator_gui.h b/inc/indicator_gui.h
index b0f79f3c149c7338abdafbd751fec6b310fa7b17..145cfcdbe1f3f1c52c322ca178fe99b31bdba76d 100644 (file)
--- a/inc/indicator_gui.h
+++ b/inc/indicator_gui.h
@@ -19,6 +19,7 @@
 
 /* DISPLAY */
 #define INDICATOR_HEIGHT 40
+#define EDJE_BASE_SCALE 2.6
 
 #define ICON_PADDING           3
 

diff --git a/res/resource/indicator_icon_animation.edc b/res/resource/indicator_icon_animation.edc
index cda3537b27f87e03ce7ff896118c2d9c473932c8..891ae85252dab02789e5b23d2fa34f6b0708cdd1 100644 (file)
--- a/res/resource/indicator_icon_animation.edc
+++ b/res/resource/indicator_icon_animation.edc
@@ -18,7 +18,7 @@
 #include "indicator_common.edc"
 
 collections {
-       base_scale: 2.6;
+       base_scale: EDJE_BASE_SCALE;
 
        group {
                name: "elm/indicator/icon/base";

diff --git a/res/resource/indicator_icon_nonfixed_theme.edc b/res/resource/indicator_icon_nonfixed_theme.edc
index f1bd2cb99f80d84d326e73bfd851f2e9b3e5748e..869e3b6e9ebf0378db7aa84b7645a6d484b0be74 100644 (file)
--- a/res/resource/indicator_icon_nonfixed_theme.edc
+++ b/res/resource/indicator_icon_nonfixed_theme.edc
@@ -18,7 +18,7 @@
 #include "indicator_common.edc"
 
 collections {
-       base_scale: 2.6;
+       base_scale: EDJE_BASE_SCALE;
 
        group {
                name: "elm/indicator/icon/base";

diff --git a/res/resource/indicator_icon_theme.edc b/res/resource/indicator_icon_theme.edc
index 472ce5508cc8632ec1f354c8a0fa4a340fe311b4..625ac099755894e340a6f927501cab8cf1123427 100644 (file)
--- a/res/resource/indicator_icon_theme.edc
+++ b/res/resource/indicator_icon_theme.edc
@@ -18,7 +18,7 @@
 #include "indicator_common.edc"
 
 collections {
-       base_scale: 2.6;
+       base_scale: EDJE_BASE_SCALE;
 
        group {
                name: "elm/indicator/icon/base";

diff --git a/res/resource/indicator_port.edc b/res/resource/indicator_port.edc
index 8ec57057864057b1b025f333a0f9bc9d927a4db4..8af3896736c3e41ea49d4fde76bb451cb8210600 100644 (file)
--- a/res/resource/indicator_port.edc
+++ b/res/resource/indicator_port.edc
@@ -19,7 +19,7 @@
 
 
 collections {
-       base_scale: 2.6;
+       base_scale: EDJE_BASE_SCALE;
 
        group {
                name: "indicator";

diff --git a/res/resource/ticker.edc b/res/resource/ticker.edc
index 6914a286195a91d3c08a0e7516bcc02c586e5868..6ded83e656536693d92e7e6d2950ccd191a4f2b2 100644 (file)
--- a/res/resource/ticker.edc
+++ b/res/resource/ticker.edc
@@ -20,7 +20,7 @@
 
 collections
 {
-       base_scale: 2.6;
+       base_scale: EDJE_BASE_SCALE;
        group {
                name: "indicator/tickernoti/text";
                data {

diff --git a/res/resource/ticker_animated_icon.edc b/res/resource/ticker_animated_icon.edc
index e4c505fd9d6f225b61924cbd1a15fa8fcadc6638..a9c07da1c41347557a7d4b4027f2e7d31f78f63d 100644 (file)
--- a/res/resource/ticker_animated_icon.edc
+++ b/res/resource/ticker_animated_icon.edc
@@ -37,7 +37,7 @@ images {
        image: "noti_install_complete.png" COMP;
 }
 collections {
-       base_scale: 2.6;
+       base_scale: EDJE_BASE_SCALE;
        group {
                name: "quickpanel/animated_icon_download";
                parts {

diff --git a/res/resource/ticker_default.edc b/res/resource/ticker_default.edc
index fd5fbfb056402aa46ea4894039d6abb7ca1b6c6c..ffc9d18a00efa4a16e652fd18e6f39a90a6000f5 100644 (file)
--- a/res/resource/ticker_default.edc
+++ b/res/resource/ticker_default.edc
@@ -15,6 +15,7 @@
  */
 
 #include "color_classes.edc"
+#include "../../inc/indicator_gui.h"
 
 #define QP_DATE_H 50
 #define QP_HANDLE_H    50
@@ -70,7 +71,7 @@ images
 }
 
 collections {
-       base_scale: 2.6;
+       base_scale: EDJE_BASE_SCALE;
        group {
                name: "quickpanel/root";
 

diff --git a/src/main.c b/src/main.c
index 635af5667cb656eb6e6d53efa5951d7d7c3e3309..b86c9777e18ad03599cca5c74afd1c89e42e7df5 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -316,7 +316,7 @@ static Eina_Bool _render_force(void *data)
 
 static int _indicator_height_calculate()
 {
-       return (int)(round(INDICATOR_HEIGHT * edje_scale_get() / elm_app_base_scale_get()));
+       return (int)(round(INDICATOR_HEIGHT * edje_scale_get() / EDJE_BASE_SCALE));
 }
 
 static void _indicator_service_cb(void *data, tzsh_indicator_service_h service,
@@ -550,7 +550,7 @@ static bool app_create(void *data)
 
        retv_if(!ad, false);
 
-       elm_app_base_scale_set(2.6);
+       elm_app_base_scale_set(EDJE_BASE_SCALE);
 
        /* Signal handler */
        struct sigaction act;