use define for base scale

Change-Id: Ibd0a5ce936a339f3fcddb4d36dd0c1f76fb73eca

diff --git a/inc/indicator_gui.h b/inc/indicator_gui.h
index b0f79f3..145cfcd 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 cda3537..891ae85 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 f1bd2cb..869e3b6 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 472ce55..625ac09 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 8ec5705..8af3896 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 6914a28..6ded83e 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 e4c505f..a9c07da 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 fd5fbfb..ffc9d18 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 635af56..b86c977 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;