power/battery: Percentage digits size fix.

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

diff --git a/inc/indicator_gui.h b/inc/indicator_gui.h
index aa5c8c4..b0f79f3 100644 (file)
--- a/inc/indicator_gui.h
+++ b/inc/indicator_gui.h
@@ -31,14 +31,12 @@
 
 #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 12
+#define BATTERY_TWO_DIGITS_WIDTH 25
+#define BATTERY_FULL_WIDTH 30
 
-#define BATTERY_DIGIT_HEIGHT 14
+#define BATTERY_DIGIT_HEIGHT 17
 
 #define MESSAGE_PADDING 12
 #define MESSAGE_ICON_WIDTH 34

diff --git a/res/resource/indicator_port.edc b/res/resource/indicator_port.edc
index 20e8ace..8ec5705 100644 (file)
--- a/res/resource/indicator_port.edc
+++ b/res/resource/indicator_port.edc
@@ -215,7 +215,7 @@ collections {
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: BATTERY_ICON_WIDTH BATTERY_ICON_HEIGHT;
+                                       min: DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
                                        fixed: 1 0;
                                        rel1 { relative: 0.0 0.0; to_x: "padding.right"; to_y: "elm.rect.bg"; }
                                        rel2 { relative: 0.0 1.0; to_x: "padding.right"; to_y: "elm.rect.bg"; }
@@ -239,10 +239,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"; 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;
+                                       rel1 { relative: 0.0 0.0; to: "elm.swallow.fixed8"; }
+                                       rel2 { relative: 1.0 0.5; to: "elm.swallow.fixed8"; }
+                                       align: 0.5 0.0;
                                        visible: 1;
                                }
                                description {
@@ -250,14 +249,12 @@ collections {
                                        inherit: "default" 0.0;
                                        min: BATTERY_TWO_DIGITS_WIDTH BATTERY_DIGIT_HEIGHT;
                                        max: BATTERY_TWO_DIGITS_WIDTH BATTERY_DIGIT_HEIGHT;
-                                       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;
-                                       rel2.offset: -3 -14;
                                }
                        }
                        //////////////////////////////////////////

diff --git a/src/box.c b/src/box.c
index e940200..cf22c19 100644 (file)
--- a/src/box.c
+++ b/src/box.c
@@ -54,7 +54,7 @@ Evas_Object *box_add(Evas_Object *parent)
        obj = elm_box_add(parent);
        retv_if(!obj, NULL);
        evas_object_size_hint_weight_set(obj, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       evas_object_size_hint_fill_set(obj, EVAS_HINT_FILL, EVAS_HINT_FILL);
+       evas_object_size_hint_align_set(obj, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
        /* Align to left-top */
        elm_box_horizontal_set(obj, EINA_TRUE);
@@ -120,27 +120,12 @@ static void _fixed_box_pack_icon(win_info *win, icon_s *icon)
                case INDICATOR_TXT_WITH_IMG_ICON:
                        break;
                case INDICATOR_DIGIT_ICON:
-                       switch (icon->digit_area) {
-                               case DIGIT_UNITY:
-                                       evas_object_show(icon->img_obj.obj);
-                                       elm_box_pack_end(win->_digit_box, icon->img_obj.obj);
-                                       break;
-                               case DIGIT_DOZENS:
-                                       evas_object_show(icon->img_obj.obj);
-                                       elm_box_pack_end(win->_digit_box, icon->img_obj.obj);
-                                       break;
-                               case DIGIT_DOZENS_UNITY:
-                                       evas_object_show(icon->img_obj.obj);
-                                       elm_box_pack_end(win->_digit_box, icon->img_obj.obj);
-                                       break;
-                               case DIGIT_HUNDREDS:
-                                       evas_object_show(icon->img_obj.obj);
-                                       elm_box_pack_end(win->_digit_box, icon->img_obj.obj);
-                                       break;
-                               default:
-                                       _E("default");
-                                       break;
-                       }
+                       evas_object_size_hint_weight_set(icon->img_obj.obj, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+                       evas_object_size_hint_align_set(icon->img_obj.obj, EVAS_HINT_FILL, EVAS_HINT_FILL);
+
+                       evas_object_show(icon->img_obj.obj);
+                       elm_box_pack_end(win->_digit_box, icon->img_obj.obj);
+
                        break;
                default:
                        _E("default");
@@ -437,6 +422,7 @@ extern void box_init(win_info *win)
        win->_digit_box = box_add(win->layout);
        ret_if(!(win->_digit_box));
 
+       elm_box_homogeneous_set(win->_digit_box, EINA_TRUE);
        evas_object_size_hint_align_set(win->_digit_box, EVAS_HINT_FILL, EVAS_HINT_FILL);
        edje_object_part_swallow(elm_layout_edje_get(win->layout), DIGIT_BOX_PART_NAME, win->_digit_box);
 

diff --git a/src/modules/power/battery.c b/src/modules/power/battery.c
index 0de9458..f695111 100644 (file)
--- a/src/modules/power/battery.c
+++ b/src/modules/power/battery.c
@@ -51,7 +51,7 @@ icon_s battery = {
        .area = INDICATOR_ICON_AREA_FIXED,
        .always_top = EINA_FALSE,
        .exist_in_view = EINA_FALSE,
-       .img_obj = {0, 0, BATTERY_ICON_WIDTH, BATTERY_ICON_HEIGHT},
+       .img_obj = {0, 0, DEFAULT_ICON_WIDTH, DEFAULT_ICON_HEIGHT},
        .obj_exist = EINA_FALSE,
        .init = register_battery_module,
        .fini = unregister_battery_module,
@@ -66,7 +66,7 @@ icon_s digit = {
        .area = INDICATOR_ICON_AREA_FIXED,
        .always_top = EINA_FALSE,
        .exist_in_view = EINA_FALSE,
-       .img_obj = {0, 0, 7, 10},
+       .img_obj = {0, 0, BATTERY_DIGIT_WIDTH, BATTERY_DIGIT_HEIGHT},
        .obj_exist = EINA_FALSE,
        .wake_up = wake_up_cb,
        .digit_area = DIGIT_UNITY
@@ -79,7 +79,7 @@ icon_s digit_additional = {
        .area = INDICATOR_ICON_AREA_FIXED,
        .always_top = EINA_FALSE,
        .exist_in_view = EINA_FALSE,
-       .img_obj = {0, 0, 7, 10},
+       .img_obj = {0, 0, BATTERY_DIGIT_WIDTH, BATTERY_DIGIT_HEIGHT},
        .obj_exist = EINA_FALSE,
        .wake_up = wake_up_cb,
        .digit_area = DIGIT_DOZENS_UNITY
@@ -278,24 +278,21 @@ static void show_digits()
        if (battery_percentage < 10) {
                digit.img_obj.data = percentage_battery_digit_icon_path[battery_percentage];
                digit.digit_area = DIGIT_UNITY;
-               digit.img_obj.width = 7;
                icon_show(&digit);
                icon_hide(&digit_additional);
 
        } else if (battery_percentage < 100) {
                digit.img_obj.data = percentage_battery_digit_icon_path[battery_percentage/10];
                digit.digit_area = DIGIT_DOZENS;
-               digit.img_obj.width = 7;
                digit_additional.img_obj.data = percentage_battery_digit_icon_path[battery_percentage%10];
                digit_additional.digit_area = DIGIT_DOZENS_UNITY;
-               digit_additional.img_obj.width = 7;
                icon_show(&digit);
                icon_show(&digit_additional);
 
        } else {
                digit.img_obj.data = percentage_battery_digit_icon_path[10];
                digit.digit_area = DIGIT_HUNDREDS;
-               digit.img_obj.width = 17;
+               digit.img_obj.width = BATTERY_FULL_WIDTH;
                icon_show(&digit);
                icon_hide(&digit_additional);
        }