[naviframe] Fix not to show more than 3 digits on badge and Fix slow calculation...

Change-Id: I0c3b922c38feeb94b41923c779e16c70de0d9549

diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc
index bb4b7ae..866ac27 100755 (executable)
--- a/themes/inc/tizen-dark-inc.edc
+++ b/themes/inc/tizen-dark-inc.edc
@@ -57,7 +57,6 @@
 #define NAVIFRAME_BADGE_LEFT_PADDING_INC 8 0
 #define NAVIFRAME_BADGE_TOP_PADDING_INC 0 10
 #define NAVIFRAME_BADGE_TEXT_LEFT_PADDING_INC 12 54
-#define NAVIFRAME_BADGE_TEXT_RIGHT_PADDING_INC 10 54
 #define NAVIFRAME_BADGE_TEXT_H_INC 34
 #define NAVIFRAME_BADGE_TEXT_MIN_W_INC 30
 #define NAVIFRAME_BADGE_TEXT_MAX_W_INC 60

diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc
index ab74eb7..1407d97 100755 (executable)
--- a/themes/inc/tizen-light-inc.edc
+++ b/themes/inc/tizen-light-inc.edc
@@ -77,10 +77,9 @@
 #define NAVIFRAME_BOTTOM_PADDING_INC 0 12
 #define NAVIFRAME_LANDSCAPE_BOTTOM_PADDING_INC 0 5
 #define NAVIFRAME_BADGE_PADDING_INC 85 0
-#define NAVIFRAME_BADGE_LEFT_PADDING_INC 8 0
+#define NAVIFRAME_BADGE_LEFT_PADDING_INC 8 54
 #define NAVIFRAME_BADGE_TOP_PADDING_INC 0 3
 #define NAVIFRAME_BADGE_TEXT_LEFT_PADDING_INC 12 54
-#define NAVIFRAME_BADGE_TEXT_RIGHT_PADDING_INC 10 54
 #define NAVIFRAME_BADGE_TEXT_H_INC 26
 #define NAVIFRAME_BADGE_TEXT_MIN_W_INC 30
 #define NAVIFRAME_BADGE_TEXT_MAX_W_INC 60

diff --git a/themes/widgets/naviframe.edc b/themes/widgets/naviframe.edc
index a6ee997..9c46293 100644 (file)
--- a/themes/widgets/naviframe.edc
+++ b/themes/widgets/naviframe.edc
@@ -996,8 +996,8 @@
                min: 0 0;
                fixed: 1 1;
                rel1 { relative: 1.0 1.0; to_x: "elm.text.title"; to_y: "badge_top_padding"; }
-               rel2 { relative: 1.0 0.5; to_x: "elm.text.title"; to_y: "title_bg"; }
-               align: 0.0 0.5;
+               rel2 { relative: 1.0 1.0; to_x: "elm.text.title"; to_y: "badge_top_padding"; }
+               align: 0.0 0.0;
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
@@ -1049,7 +1049,7 @@
             description {
                state: "visible" 0.0;
                inherit: "default" 0.0;
-               min: NAVIFRAME_BADGE_TEXT_RIGHT_PADDING_INC;
+               min: NAVIFRAME_BADGE_TEXT_LEFT_PADDING_INC;
             }
          }
          part { name: "badge_bg";
@@ -1089,7 +1089,7 @@
                visible: 0;
                min: NAVIFRAME_BADGE_TEXT_MIN_W_INC 0;
                max: NAVIFRAME_BADGE_TEXT_MAX_W_INC -1;
-               fixed: 1 0;
+               fixed: 1 1;
                rel1 { relative: 1.0 0.0; to: "left.padding.text"; }
                rel2 { relative: 1.0 1.0; to_y: "left.padding.text"; to_x: "badge_padding"; }
                align: 0.0 0.5;
@@ -1097,7 +1097,7 @@
                text {
                   font: "Tizen:style=Bold";
                   size: NAVIFRAME_BADGE_TEXT_H_INC;
-                  min: 1 1;
+                  min: 0 0;
                   max: 1 0;
                   text_class: "tizen";
                }