Resize window & Resize time and icons

Change-Id: I05e4c65d62a4e546f5c4df031027676b610a7c55

diff --git a/daemon/main.c b/daemon/main.c
index 9aab38d..188f349 100644 (file)
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -702,6 +702,7 @@ static Eina_Bool _indicator_listen_timer_cb(void* data)
        }
 }
 
+#define INDICATOR_HEIGHT_TM1 52
 static void _create_window(struct appdata *ad)
 {
        Evas_Object *dummy_win = NULL;
@@ -738,11 +739,13 @@ static void _create_window(struct appdata *ad)
        evas_object_size_hint_fill_set(ad->win.win , EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(ad->win.win , 1.0, 0.5);
 
+       evas_object_resize(ad->win.win, ad->win.port_w, INDICATOR_HEIGHT_TM1);
+       _D("w,h(%d,%d)", ad->win.port_w, INDICATOR_HEIGHT_TM1);
+
        evas_object_show(ad->win.win);
 
 }
 
-#define INDICATOR_HEIGHT_TM1 52
 static void _create_base_gui(void* data)
 {
        struct appdata *ad = data;
@@ -763,13 +766,11 @@ static void _create_base_gui(void* data)
        ad->win.w = ad->win.port_w;
        ad->win.evas = evas_object_evas_get(ad->win.win);
 
-       //_D("win_size = Original(%d, %d), Scaled(%lf, %lf)", ad->win.port_w, ad->win.h, ELM_SCALE_SIZE(ad->win.port_w), ELM_SCALE_SIZE(ad->win.h));
+       _D("win_size = Original(%d, %d), Scaled(%lf, %lf)", ad->win.port_w, ad->win.h, ELM_SCALE_SIZE(ad->win.port_w), ELM_SCALE_SIZE(ad->win.h));
 
        _create_layout(ad, EDJ_FILE, GRP_NAME);
-
        _create_box(&(ad->win));
 
-       ad->win.data = data;
 
 #if 0 /* For test */
        Evas_Object *rect = evas_object_rectangle_add(ad->win.evas);
@@ -779,6 +780,7 @@ static void _create_base_gui(void* data)
        evas_object_show(rect);
        evas_object_layer_set(rect, -256);
 #endif
+       ad->win.data = data;
 
        return;
 }

diff --git a/data/resource/indicator_gui.h b/data/resource/indicator_gui.h
index 644558b..173a946 100644 (file)
--- a/data/resource/indicator_gui.h
+++ b/data/resource/indicator_gui.h
@@ -41,12 +41,12 @@
 #define DEFAULT_ICON_PADDING 3
 #define NOTI_ICON_PADDING 2
 
-#define DEFAULT_ICON_HEIGHT    25
-#define DEFAULT_ICON_WIDTH     25
-#define BATTERY_ICON_WIDTH     25
-#define BATTERY_ICON_HEIGHT    25
-#define FIXED4_ICON_HEIGHT     25
-#define FIXED4_ICON_WIDTH      25
+#define DEFAULT_ICON_HEIGHT    31
+#define DEFAULT_ICON_WIDTH     31
+#define BATTERY_ICON_WIDTH     31
+#define BATTERY_ICON_HEIGHT    31
+#define FIXED4_ICON_HEIGHT     31
+#define FIXED4_ICON_WIDTH      31
 
 #define BATTERY_DIGIT_WIDTH 8
 #define BATTERY_DIGIT_HEIGHT 12

diff --git a/data/resource/indicator_icon_animation.edc b/data/resource/indicator_icon_animation.edc
index 6d07f81..6f8b9e3 100644 (file)
--- a/data/resource/indicator_icon_animation.edc
+++ b/data/resource/indicator_icon_animation.edc
@@ -22,7 +22,7 @@
 #include "indicator_common.edc"
 
 collections {
-       base_scale: 1.7;
+       base_scale: 2.6;
 
        group {
                name: "elm/indicator/icon/base";

diff --git a/data/resource/indicator_icon_nonfixed_theme.edc b/data/resource/indicator_icon_nonfixed_theme.edc
index 8f723ce..afe8d40 100644 (file)
--- a/data/resource/indicator_icon_nonfixed_theme.edc
+++ b/data/resource/indicator_icon_nonfixed_theme.edc
@@ -22,7 +22,7 @@
 #include "indicator_common.edc"
 
 collections {
-       base_scale: 1.7;
+       base_scale: 2.6;
 
        group {
                name: "elm/indicator/icon/base";

diff --git a/data/resource/indicator_icon_theme.edc b/data/resource/indicator_icon_theme.edc
index 23ffc65..a713eee 100644 (file)
--- a/data/resource/indicator_icon_theme.edc
+++ b/data/resource/indicator_icon_theme.edc
@@ -22,7 +22,7 @@
 #include "indicator_common.edc"
 
 collections {
-       base_scale: 1.7;
+       base_scale: 2.6;
 
        group {
                name: "elm/indicator/icon/base";

diff --git a/data/resource/ticker.edc b/data/resource/ticker.edc
index c9a89df..e88ed6e 100755 (executable)
--- a/data/resource/ticker.edc
+++ b/data/resource/ticker.edc
@@ -22,7 +22,7 @@
  
 collections
 {
-       base_scale: 2.6;
+       base_scale: 1.7;
 
        group {
                name: "quickpanel/tickernoti/text";

diff --git a/modules/clock/clock.c b/modules/clock/clock.c
index 2042d97..6f4ddd2 100644 (file)
--- a/modules/clock/clock.c
+++ b/modules/clock/clock.c
@@ -39,9 +39,9 @@
 
 #define SYSTEM_RESUME          "system_wakeup"
 
-#define TIME_FONT_SIZE_24              ELM_SCALE_SIZE(14)
-#define TIME_FONT_SIZE_12              ELM_SCALE_SIZE(14)
-#define AMPM_FONT_SIZE         ELM_SCALE_SIZE(13)
+#define TIME_FONT_SIZE_24              ELM_SCALE_SIZE(30)
+#define TIME_FONT_SIZE_12              ELM_SCALE_SIZE(30)
+#define AMPM_FONT_SIZE         ELM_SCALE_SIZE(29)
 
 #define TIME_FONT_COLOR                200, 200, 200, 255
 #define AMPM_FONT_COLOR                200, 200, 200, 255