[button] Fix the naviframe toolbar button position and style

Change-Id: Id03513fa8bad177c3bcd4b1b922dc6111494e1f9

diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc
index 4a53a75..ed16a73 100644 (file)
--- a/themes/inc/tizen-hd-inc.edc
+++ b/themes/inc/tizen-hd-inc.edc
@@ -314,7 +314,12 @@
 #define BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 255
 
 #define BUTTON_NAVIFRAME_TEXT_SHADOW_NORMAL_COLOR_INC 255 255 255 255
-#define BUTTON_NAVIFRAME_TEXT_SHADOW_DIM_COLOR_INC 0 0 0 163
+#define BUTTON_NAVIFRAME_TEXT_SHADOW_DIM_COLOR_INC 255 255 255 163
+#define BUTTON_NAVIFRAME_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 163
+
+#define BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC "#FFFFFFFF"
+#define BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_DIM_COLOR_INC "#FFFFFFA3"
+#define BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC "#000000A3"
 
 #define BUTTON_TICKER_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 127
 #define BUTTON_TICKER_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 127
@@ -403,6 +408,11 @@
 #define BUTTON_NAVIFRAME_TITLE_TEXT_FOCUSED_COLOR_INC 255 255 255 255
 #define BUTTON_NAVIFRAME_TITLE_TEXT_DISABLED_COLOR_INC 58 58 58 76
 
+#define BUTTON_NAVIFRAME_TITLE_TEXTBLOCK_NORMAL_COLOR_INC "#3A3A3AFF"
+#define BUTTON_NAVIFRAME_TITLE_TEXTBLOCK_PRESSED_COLOR_INC "#FFFFFFFF"
+#define BUTTON_NAVIFRAME_TITLE_TEXTBLOCK_FOCUSED_COLOR_INC "#FFFFFFFF"
+#define BUTTON_NAVIFRAME_TITLE_TEXTBLOCK_DISABLED_COLOR_INC "#3A3A3A4C"
+
 #define BUTTON_CIRCLE_STYLE_NORMAL_COLOR_INC 101 101 101 255
 #define BUTTON_CIRCLE_STYLE_PRESSED_COLOR_INC 255 255 255 255
 #define BUTTON_CIRCLE_STYLE_DISABLED_COLOR_INC 101 101 101 76

diff --git a/themes/widgets/button.edc b/themes/widgets/button.edc
index 07aaef2..f6e17f4 100644 (file)
--- a/themes/widgets/button.edc
+++ b/themes/widgets/button.edc
@@ -4399,7 +4399,19 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
       }
       styles{
          style { name: "btn_naviframe_toolbar";
-            base: "font=Tizen:style=Bold font_size="BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC" align=center color=#ffffff ellipsis=1.0 wrap=none text_class=tizen";
+            base: "font=Tizen:style=Bold font_size="BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC" align=center color="BUTTON_NAVIFRAME_TITLE_TEXTBLOCK_NORMAL_COLOR_INC" style=shadow,bottom shadow_color="BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_naviframe_toolbar_pressed";
+            base: "font=Tizen:style=Bold font_size="BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC" align=center color="BUTTON_NAVIFRAME_TITLE_TEXTBLOCK_PRESSED_COLOR_INC" style=shadow,top shadow_color="BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_naviframe_toolbar_disabled";
+            base: "font=Tizen:style=Bold font_size="BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC" align=center color="BUTTON_NAVIFRAME_TITLE_TEXTBLOCK_DISABLED_COLOR_INC" style=shadow,bottom shadow_color="BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_DIM_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
             tag: "br" "\n";
             tag: "ps" "ps";
             tag: "tab" "\t";
@@ -4473,7 +4485,7 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                   relative: 0.0 0.0;
                   to: "elm.text";
                }
-               align: 1.0 0.0;
+               align: 1.0 1.0;
             }
          }
          part { name: "padding_text_right_bottom";
@@ -4496,7 +4508,6 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             type: TEXTBLOCK;
             clip_to: "disclip";
             mouse_events: 0;
-            effect: FAR_SHADOW BOTTOM;
             scale: 1;
             description { state: "default" 0.0;
                visible: 0;
@@ -4510,8 +4521,6 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
                }
-               color: BUTTON_NAVIFRAME_TITLE_TEXT_NORMAL_COLOR_INC;
-               color2: BUTTON_NAVIFRAME_TEXT_SHADOW_NORMAL_COLOR_INC;
                text {
                   min: 0 1;
                   max: 1 1;
@@ -4525,21 +4534,26 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_NAVIFRAME_TITLE_TEXT_PRESSED_COLOR_INC;
+               text {
+                  style: "btn_naviframe_toolbar_pressed";
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_NAVIFRAME_TITLE_TEXT_DISABLED_COLOR_INC;
-               color2: BUTTON_NAVIFRAME_TEXT_SHADOW_NORMAL_COLOR_INC;
                visible: 1;
+               text {
+                  style: "btn_naviframe_toolbar_disabled";
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_NAVIFRAME_TITLE_TEXT_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_naviframe_toolbar_pressed";
+               }
             }
          }
          part { name: "disclip";
@@ -4743,7 +4757,6 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             type: TEXTBLOCK;
             clip_to: "disclip";
             mouse_events: 0;
-            effect: FAR_SHADOW BOTTOM;
             scale: 1;
             description { state: "default" 0.0;
                visible: 0;
@@ -4758,8 +4771,6 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                   to: "padding_right_bottom";
                }
                align: 1.0 0.5;
-               color: BUTTON_NAVIFRAME_TITLE_TEXT_NORMAL_COLOR_INC;
-               color2: BUTTON_NAVIFRAME_TEXT_SHADOW_NORMAL_COLOR_INC;
                text {
                   min: 0 1;
                   max: 1 1;
@@ -4773,21 +4784,26 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_NAVIFRAME_TITLE_TEXT_PRESSED_COLOR_INC;
+               text {
+                  style: "btn_naviframe_toolbar_pressed";
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_NAVIFRAME_TITLE_TEXT_DISABLED_COLOR_INC;
-               color2: BUTTON_NAVIFRAME_TEXT_SHADOW_NORMAL_COLOR_INC;
                visible: 1;
+               text {
+                  style: "btn_naviframe_toolbar_disabled";
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_NAVIFRAME_TITLE_TEXT_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_naviframe_toolbar_pressed";
+               }
             }
          }
       }
@@ -4829,7 +4845,6 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             type: TEXTBLOCK;
             clip_to: "disclip";
             mouse_events: 0;
-            effect: FAR_SHADOW BOTTOM;
             scale: 1;
             description { state: "default" 0.0;
                visible: 0;
@@ -4844,8 +4859,6 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                   to: "padding_right_bottom";
                }
                align: 0.0 0.5;
-               color: BUTTON_NAVIFRAME_TITLE_TEXT_NORMAL_COLOR_INC;
-               color2: BUTTON_NAVIFRAME_TEXT_SHADOW_NORMAL_COLOR_INC;
                text {
                   min: 0 1;
                   max: 1 1;
@@ -4859,21 +4872,26 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_NAVIFRAME_TITLE_TEXT_PRESSED_COLOR_INC;
+               text {
+                  style: "btn_naviframe_toolbar_pressed";
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_NAVIFRAME_TITLE_TEXT_DISABLED_COLOR_INC;
-               color2: BUTTON_NAVIFRAME_TEXT_SHADOW_NORMAL_COLOR_INC;
                visible: 1;
+               text {
+                  style: "btn_naviframe_toolbar_disabled";
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_NAVIFRAME_TITLE_TEXT_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_naviframe_toolbar_pressed";
+               }
             }
          }
       }