Indicator dimensions fixes.

Fixes are related to GUI update.

Change-Id: Ia7e514efbdd6b0867d9dd3a6598f40db0c04e57f
Signed-off-by: Radoslaw Czerski <r.czerski@samsung.com>

diff --git a/inc/indicator.h b/inc/indicator.h
index 6f489c3c5c8151f8ae1eb65edc04ae9bbace75e3..6892ab08f86db6ca0c24e831be21d57e1b802c40 100644 (file)
--- a/inc/indicator.h
+++ b/inc/indicator.h
@@ -30,7 +30,6 @@
 #define VCONFKEY_APPTRAY_STATE "file/private/org.tizen.app-tray/is_top"
 
 #define FIXED_COUNT    11
-#define INDICATOR_HEIGHT 36
 
 #define _INDICATOR_FEATURE_LITE
 #define _INDICATOR_REMOVE_SEARCH

diff --git a/inc/indicator_gui.h b/inc/indicator_gui.h
index 173a9465845966e4403a686e5a4fe70f40e75349..ffdcb1aafbc358ff95342f45dbd956b0ae27b9e8 100644 (file)
--- a/inc/indicator_gui.h
+++ b/inc/indicator_gui.h
@@ -22,36 +22,32 @@
 #define __INDICATOR_GUI_H__
 
 /* DISPLAY */
-#define INDICATOR_HEIGHT 36
-#define INDICATOR_SIMPLE_HEIGHT 20
+#define INDICATOR_HEIGHT 40
+
 #define ICON_PADDING           3
 
 #define PADDING_WIDTH          10
-#define LEFT_PADDING_WIDTH     3
-#define RIGHT_PADDING_WIDTH    6
-#define INDICATOR_PADDING_H 4
-
-
-#define CLOCK_WIDTH_1  110
-#define CLOCK_WIDTH_2  120
-
-#define CLOCK_HEIGHT   34
-#define CLOCK_PADDING  10
+#define LEFT_PADDING_WIDTH     4
+#define RIGHT_PADDING_WIDTH    4
+#define INDICATOR_PADDING_H 3
 
 #define DEFAULT_ICON_PADDING 3
-#define NOTI_ICON_PADDING 2
 
-#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 DEFAULT_ICON_HEIGHT    34
+#define DEFAULT_ICON_WIDTH     34
+#define BATTERY_ICON_WIDTH     34
+#define BATTERY_ICON_HEIGHT    34
+
+#define BATTERY_DIGIT_WIDTH 10
+#define BATTERY_TWO_DIGITS_WIDTH 21
+#define BATTERY_FULL_WIDTH 25
 
-#define BATTERY_DIGIT_WIDTH 8
-#define BATTERY_DIGIT_HEIGHT 12
+#define BATTERY_DIGIT_HEIGHT 14
 
-#define MESSAGE_PADDING 10
+#define MESSAGE_PADDING 12
+#define MESSAGE_ICON_WIDTH 30
+#define MESSAGE_ICON_HEIGHT 30
+#define MESSAGE_ICON_PADDING 12
 
 #define NONFIXED_DEFAULT_PADDING 25
 #define NONFIXED_DYNAMIC_PADDING 11

diff --git a/res/resource/indicator_port.edc b/res/resource/indicator_port.edc
index 055f14a224c6cae70897c0f9e9caa18474c4b2d7..d235bacbd217aa7590c683973c00db841882aa76 100644 (file)
--- a/res/resource/indicator_port.edc
+++ b/res/resource/indicator_port.edc
@@ -551,7 +551,7 @@ collections {
                                description {
                                        state: "default" 0.0;
 #ifndef _INDICATOR_REMOVE_SEARCH
-                                       min: HOME_PADDING_PORTRAIT FIXED4_ICON_HEIGHT;
+                                       min: HOME_PADDING_PORTRAIT DEFAULT_ICON_HEIGHT;
 #else
                                        min: 0 0;
 #endif
@@ -671,28 +671,28 @@ collections {
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: 10 14;
-                                       max: 10 14;
-                                       rel1 { relative: 0.0 0.0; to_x: "elm.swallow.fixed8"; offset: 10 1; }
-                                       rel2 { relative: 1.0 1.0; to_x: "elm.swallow.fixed8"; offset: -10 -15; }
+                                       min: BATTERY_DIGIT_WIDTH BATTERY_DIGIT_HEIGHT;
+                                       max: BATTERY_DIGIT_WIDTH BATTERY_DIGIT_HEIGHT;
+                                       rel1 { relative: 0.0 0.0; to_x: "elm.swallow.fixed8"; }
+                                       rel2 { relative: 1.0 1.0; to_x: "elm.swallow.fixed8"; offset: -8 -14; }
                                        align: 1.0 0.5;
                                        visible: 1;
                                }
                                description {
                                        state: "two_digits" 0.0;
                                        inherit: "default" 0.0;
-                                       min: 20 14;
-                                       max: 20 14;
-                                       rel1 { relative: 0.0 0.0; to_x: "elm.swallow.fixed8"; offset: 5 1; }
-                                       rel2 { relative: 1.0 1.0; to_x: "elm.swallow.fixed8"; offset: -4 -15; }
+                                       min: BATTERY_TWO_DIGITS_WIDTH BATTERY_DIGIT_HEIGHT;
+                                       max: BATTERY_TWO_DIGITS_WIDTH BATTERY_DIGIT_HEIGHT;
+                                       rel1 { relative: 0.0 0.0; to_x: "elm.swallow.fixed8"; }
+                                       rel2 { relative: 1.0 1.0; to_x: "elm.swallow.fixed8"; offset: -4 -14; }
                                }
                                description {
                                        state: "three_digits" 0.0;
                                        inherit: "default" 0.0;
-                                       min: 25 14;
-                                       max: 25 14;
-                                       rel1 { relative: 0.0 0.0; to_x: "elm.swallow.fixed8"; offset: 3 1; }
-                                       rel2 { relative: 1.0 1.0; to_x: "elm.swallow.fixed8"; offset: -2 -15; }
+                                       min: BATTERY_FULL_WIDTH BATTERY_DIGIT_HEIGHT;
+                                       max: BATTERY_FULL_WIDTH BATTERY_DIGIT_HEIGHT;
+                                       rel1 { relative: 0.0 0.0; to_x: "elm.swallow.fixed8"; }
+                                       rel2 { relative: 1.0 1.0; to_x: "elm.swallow.fixed8"; offset: -3 -14; }
                                }
                        }
                        //////////////////////////////////////////
@@ -879,7 +879,7 @@ collections {
                                description {
                                        state: "default" 0.0;
 #ifndef _INDICATOR_REMOVE_SEARCH
-                                       min: HOME_PADDING_PORTRAIT FIXED4_ICON_HEIGHT;
+                                       min: HOME_PADDING_PORTRAIT DEFAULT_ICON_HEIGHT;
 #else
                                        min: 0 0;
 #endif
@@ -1596,6 +1596,24 @@ collections {
                                target: "elm.swallow.fixed5";
                                target: "elm.rect.wifi";
                        }
+                       // BLUETOOTH
+                       program {
+                               name: "indicator.bluetooth.show";
+                               action: STATE_SET "default" 0.0;
+                               signal: "indicator.bluetooth.show";
+                               source: "indicator.prog";
+                               target: "elm.swallow.fixed6";
+                               target: "elm.rect.bt";
+                       }
+
+                       program {
+                               name: "indicator.bluetooth.hide";
+                               action: STATE_SET "hide" 0.0;
+                               signal: "indicator.bluetooth.hide";
+                               source: "indicator.prog";
+                               target: "elm.swallow.fixed6";
+                               target: "elm.rect.bt";
+                       }
                        // WIFI-Direct
                        program {
                                name: "indicator.wifidirect.show";

diff --git a/res/resource/ticker.edc b/res/resource/ticker.edc
index cf98aa08bba1d4f8ca5f5e2d4872e123b80f9e34..55328ede58b3b152975a739fa68b4fc5a837b015 100755 (executable)
--- a/res/resource/ticker.edc
+++ b/res/resource/ticker.edc
@@ -14,16 +14,12 @@
  * limitations under the License.
  *
  */
-
 #include "color_classes.edc"
 #include "../../inc/indicator_gui.h"
-
 #define TICKERNOTI_MAIN_TEXT_HEIGHT_INC 1
- 
 collections
 {
        base_scale: 1.7;
-
        group {
                name: "quickpanel/tickernoti/text";
                data {
@@ -58,7 +54,6 @@ collections
                        }
                }
        }
-
        group {
                name: "quickpanel/tickernoti/normal";
                data {
@@ -72,8 +67,11 @@ collections
                                description {
                                        state: "default" 0.0;
                                        align: 0.0 0.0;
+                                       rel1
+                         {
+                                offset: LEFT_PADDING_WIDTH 0;
+                         }
                                }
-
                        }
                        part {
                                name: "clipper";
@@ -98,7 +96,6 @@ collections
                                        rel2.to: "base";
                                }
                        }
-
                        part {
                                name: "bg_img";
                                mouse_events: 0;
@@ -107,7 +104,6 @@ collections
                                description { state: "default" 0.0;
                                        visible: 1;
                                        align:0.0 0.0;
-
                                        rel1.to: "bg";
                                        rel2.to: "bg";
                                        /* FIXME */
@@ -125,8 +121,8 @@ collections
                                description {
                                        state: "default" 0.0;
                                        fixed: 1 1;
-                                       min: 25 25;
-                                       max: 25 25;
+                                       min: MESSAGE_ICON_WIDTH MESSAGE_ICON_HEIGHT;
+                                       max: MESSAGE_ICON_WIDTH MESSAGE_ICON_HEIGHT;
                                        align: 0.0 0.5;
                                        rel1
                                        {
@@ -149,14 +145,14 @@ collections
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       max: 800 36;
+                                       min: 0 INDICATOR_HEIGHT;
                                        fixed: 1 1;
                                        align: 0.0 0.5;
                                        rel1 {
                                                relative: 1.0 0.0;
                                                to_x: "icon";
                                                to_y: "base";
-                                               offset: 10 0;
+                                               offset: MESSAGE_ICON_PADDING 0;
                                        }
                                        rel2 {
                                                relative: 1.0 0.9;
@@ -169,7 +165,7 @@ collections
                                type: RECT;
                                mouse_events: 1;
                                repeat_events: 1;
-                       description {
+                               description {
                                        state: "default" 0.0;
                                        color: 0 0 0 0;
                                        rel1 {
@@ -213,4 +209,4 @@ collections
                        }
                }
        }
-}
+}
\ No newline at end of file

diff --git a/src/modules/home/search.c b/src/modules/home/search.c
index 09eacbc5df164807cf64e8dcf11f1af2b64924d8..2e2a9c352098c5d0b0a5ae002050cfb1c69566e4 100644 (file)
--- a/src/modules/home/search.c
+++ b/src/modules/home/search.c
@@ -48,7 +48,7 @@ icon_s search = {
        .name = MODULE_NAME,
        .priority = ICON_PRIORITY,
        .always_top = EINA_FALSE,
-       .img_obj = {0, 0, FIXED4_ICON_WIDTH, FIXED4_ICON_HEIGHT},
+       .img_obj = {0, 0, DEFAULT_ICON_WIDTH, DEFAULT_ICON_HEIGHT},
        .obj_exist = EINA_FALSE,
        .area = INDICATOR_ICON_AREA_FIXED,
        .exist_in_view = EINA_FALSE,