battery: hide battery percentage on ticker msg [fix]

Change-Id: I4482c8d0096f9837ebb0f1d5128a88e1d5949b0d

diff --git a/res/resource/indicator_port.edc b/res/resource/indicator_port.edc
index 82d6a0eee9eb09888b9cb164f2c74b93beb48e8d..a6b5afa87b497a350723f78d1f605e4cc1489d07 100644 (file)
--- a/res/resource/indicator_port.edc
+++ b/res/resource/indicator_port.edc
@@ -646,8 +646,9 @@ collections {
                                        state: "default" 0.0;
                                        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; }
+                                       rel1 { relative: 0.0 0.0; to_x: "elm.swallow.fixed8"; to_y: "elm.rect.bg"; }
+                                       rel2 { relative: 1.0 1.0; to_x: "elm.swallow.fixed8"; to_y: "elm.rect.bg";
+                                               offset: -8 -14; }
                                        align: 1.0 0.5;
                                        visible: 1;
                                }
@@ -656,16 +657,14 @@ collections {
                                        inherit: "default" 0.0;
                                        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; }
+                                       rel2.offset: -4 -14;
                                }
                                description {
                                        state: "three_digits" 0.0;
                                        inherit: "default" 0.0;
                                        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; }
+                                       rel2.offset: -3 -14;
                                }
                        }
                        //////////////////////////////////////////

diff --git a/src/box.c b/src/box.c
index d64ad23f648a5c12f84f607bda08de2eb9fbdcef..c417ef64f0705207535bf0cb8f734daf4ab32008 100644 (file)
--- a/src/box.c
+++ b/src/box.c
@@ -322,8 +322,8 @@ static void _update_display(win_info *win)
        } else {
                util_signal_emit(win->data, "indicator.minictrl.hide", "indicator.prog");
        }
-       if
-       (box_get_list_size(CONNECTION_SYSTEM_LIST)) {
+
+       if (box_get_list_size(CONNECTION_SYSTEM_LIST)) {
                util_signal_emit(win->data, "indicator.connection/system.show", "indicator.prog");
        } else {
                util_signal_emit(win->data, "indicator.connection/system.hide", "indicator.prog");

diff --git a/src/modules/power/battery.c b/src/modules/power/battery.c
index 92868f35260fcc9787497e022612c4410800465f..ca0e2a076c3f23338afb2c5c7c86b48a098a1566 100644 (file)
--- a/src/modules/power/battery.c
+++ b/src/modules/power/battery.c
@@ -507,7 +507,7 @@ static int unregister_battery_module(void)
 }
 
 
-static void _resize_battery_digits_icons_box()
+static void _resize_battery_digits_icons_box(void)
 {
        if (battery_percentage < 10) {
                util_signal_emit(digit.ad, "indicator.battery.percentage.one.digit.show", "indicator.prog");