[toolbar]apply Dark theme ver 0.5

Change-Id: Ieb7ebe2b4b4572ab055d9a5a6b6da0b32e50c957

diff --git a/themes/images/HD/dark/Naviframe/00_tab_focus.png b/themes/images/HD/dark/Naviframe/00_tab_focus.png
index d14a8e0..95e1eff 100644 (file)
Binary files a/themes/images/HD/dark/Naviframe/00_tab_focus.png and b/themes/images/HD/dark/Naviframe/00_tab_focus.png differ

diff --git a/themes/images/HD/dark/Naviframe/00_tab_press.png b/themes/images/HD/dark/Naviframe/00_tab_press.png
index 6e2104d..957e6ea 100644 (file)
Binary files a/themes/images/HD/dark/Naviframe/00_tab_press.png and b/themes/images/HD/dark/Naviframe/00_tab_press.png differ

diff --git a/themes/images/HD/dark/Naviframe/00_tab_select_bar.png b/themes/images/HD/dark/Naviframe/00_tab_select_bar.png
new file mode 100644 (file)
index 0000000..d14a8e0
Binary files /dev/null and b/themes/images/HD/dark/Naviframe/00_tab_select_bar.png differ

diff --git a/themes/images/HD/light/Naviframe/00_tab_select_bar.png b/themes/images/HD/light/Naviframe/00_tab_select_bar.png
new file mode 100644 (file)
index 0000000..d14a8e0
Binary files /dev/null and b/themes/images/HD/light/Naviframe/00_tab_select_bar.png differ

diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc
index 6f0bc6e..afde37d 100755 (executable)
--- a/themes/inc/tizen-dark-inc.edc
+++ b/themes/inc/tizen-dark-inc.edc
@@ -1185,9 +1185,11 @@
 #define TOOLBAR_ITEM_SEPARATOR_LEFT_COLOR_INC 53 53 53 255
 #define TOOLBAR_ITEM_SEPARATOR_MIDDLE_COLOR_INC 0 0 0 255
 #define TOOLBAR_ITEM_SEPARATOR_RIGHT_COLOR_INC 25 25 25 255
+#define TOOLBAR_ITEM_BG_DEFAULT_BORDER_INC 8 8 8 8
 #define TOOLBAR_ITEM_BG_SELECTED_BORDER_INC 8 8 8 8
-#define TABBAR_ITEM_TEXTBLOCK_COLOR_INC "#fafafa"
-#define TABBAR_ITEM_SELECTED_TEXTBLOCK_COLOR_INC "#fafafa"
+#define TOOLBAR_ITEM_TEXTBLOCK_COLOR_INC "#fafafa"
+#define TABBAR_ITEM_TEXTBLOCK_COLOR_INC "#f0f0f0"
+#define TABBAR_ITEM_SELECTED_TEXTBLOCK_COLOR_INC "#f0f0f0"
 #define TABBAR_ITEM_BG_DEFAULT_BORDER_INC 9 9 9 9
 #define TABBAR_ITEM_BG_DEFAULT_VISIBLE_INC 0
 #define TABBAR_ITEM_BG_DEFAULT_COLOR_INC 255 255 255 0

diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc
index 4729604..0f815e2 100755 (executable)
--- a/themes/inc/tizen-light-inc.edc
+++ b/themes/inc/tizen-light-inc.edc
@@ -1215,7 +1215,9 @@
 #define TOOLBAR_ITEM_SEPARATOR_RIGHT_COLOR_INC 25 25 25 255
 #define TOOLBAR_ITEM_BG_REL1_OFFSET_INC 4 4
 #define TOOLBAR_ITEM_BG_REL2_OFFSET_INC -5 -5
+#define TOOLBAR_ITEM_BG_DEFAULT_BORDER_INC 8 8 8 8
 #define TOOLBAR_ITEM_BG_SELECTED_BORDER_INC 3 3 3 3
+#define TOOLBAR_ITEM_TEXTBLOCK_COLOR_INC "#fafafa"
 #define TABBAR_ITEM_TEXTBLOCK_COLOR_INC "#999999"
 #define TABBAR_ITEM_SELECTED_TEXTBLOCK_COLOR_INC "#3b73b6"
 #define TABBAR_ITEM_BG_DEFAULT_BORDER_INC 9 9 9 9

diff --git a/themes/widgets/toolbar.edc b/themes/widgets/toolbar.edc
index c27afcb..96c41d9 100644 (file)
--- a/themes/widgets/toolbar.edc
+++ b/themes/widgets/toolbar.edc
@@ -26,6 +26,16 @@
 
 #define TOOLBAR_TEXT_STYLE(_font_size) \
    style { name: "toolbar_text_style_"_font_size; \
+      base: "font=Tizen:style=Bold style=far_shadow,bottom shadow_color=#000000be font_size="_font_size" align=center color="TOOLBAR_ITEM_TEXTBLOCK_COLOR_INC" wrap=word ellipsis=1 text_class=tizen linegap=0"; \
+      tag: "br" "\n"; \
+      tag: "ps" "ps"; \
+      tag: "hilight" "+ font=Tizen:style=Bold"; \
+      tag: "b" "+ font=Tizen:style=Bold"; \
+      tag: "tab" "\t"; \
+   }
+
+#define TABBAR_TEXT_STYLE(_font_size) \
+   style { name: "tabbar_text_style_"_font_size; \
       base: "font=Tizen:style=Bold style=far_shadow,bottom shadow_color=#000000ff font_size="_font_size" align=center color="TABBAR_ITEM_TEXTBLOCK_COLOR_INC" wrap=word ellipsis=1 text_class=tizen linegap=0"; \
       tag: "br" "\n"; \
       tag: "ps" "ps"; \
@@ -45,10 +55,8 @@
    }
 
 styles{
-   TOOLBAR_TEXT_STYLE(30)
+   TABBAR_TEXT_STYLE(30)
    TOOLBAR_TEXT_STYLE(36)
-   TOOLBAR_SELECTED_TEXT_STYLE(30)
-   TOOLBAR_SELECTED_TEXT_STYLE(36)
 }
 
 group { name: "elm/toolbar/base/default";
@@ -77,7 +85,7 @@ group { name: "elm/toolbar/base/default";
             }
             image {
                 normal: "00_toolbar_bg.png";
-                border: 8 8 8 8;
+                border: TOOLBAR_ITEM_BG_DEFAULT_BORDER_INC;
                 border_scale: 1;
             }
          }
@@ -776,8 +784,8 @@ group { name: "elm/toolbar/item/tabbar";
    images {
       image: "00_tab_press.png" COMP;
       image: "00_badge_bg.png" COMP;
-      image: "00_focus.png" COMP;
       image: "00_tab_focus.png" COMP;
+      image: "00_tab_select_bar.png" COMP;
       image: "00_effect_tab_text_dim_left.png" COMP;
       image: "00_effect_tab_text_dim_right.png" COMP;
    }
@@ -882,13 +890,43 @@ group { name: "elm/toolbar/item/tabbar";
             min: 180 0;
          }
       }
+      part { name: "selected_line";
+         type: IMAGE;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1 {
+                relative: 0.0 1.0;
+            }
+            rel2 {
+                relative: 1.0 1.0;
+            }
+            image {
+                normal: "00_tab_select_bar.png";
+                border: 1 1 1 1;
+                border_scale: 1;
+            }
+            align: 0.0 1.0;
+            min: 0 10;
+            fixed: 0 1;
+            visible: 0;
+         }
+         description { state: "selected" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
       part { name: "bg_cover";
          type: IMAGE;
          scale: 1;
          mouse_events: 0;
          description { state: "default" 0.0;
             visible: 0;
-            image.normal: "00_tab_press.png";
+            image {
+               normal: "00_tab_press.png";
+               border: 0 0 8 0;
+               border_scale: 1;
+            }
          }
          description { state: "pressed" 0.0;
             inherit: "default" 0.0;
@@ -1117,7 +1155,7 @@ group { name: "elm/toolbar/item/tabbar";
             fixed: 1 1;
             max: 0 34;
             text {
-               style: "toolbar_text_style_30";
+               style: "tabbar_text_style_30";
                min: 0 1;
                max: 1 0;
             }
@@ -1153,7 +1191,7 @@ group { name: "elm/toolbar/item/tabbar";
             max: 0 34;
             fixed: 1 1;
             text {
-               style: "toolbar_text_style_30";
+               style: "tabbar_text_style_30";
                min: 0 1;
                max: 1 0;
             }
@@ -1170,59 +1208,33 @@ group { name: "elm/toolbar/item/tabbar";
             align: 0.0 0.5;
          }
       }
-      part { name: "selected_line";
-         type: IMAGE;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1 {
-                relative: 0.0 1.0;
-            }
-            rel2 {
-                relative: 1.0 1.0;
-            }
-            image {
-                normal: "00_tab_focus.png";
-                border: 1 1 1 1;
-                border_scale: 1;
-            }
-            align: 0.0 1.0;
-            min: 0 10;
-            fixed: 0 1;
-            visible: 0;
-         }
-         description { state: "selected" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
       part { name: "padding.badge";
          type: RECT;
          scale: 1;
          mouse_events: 0;
          description { state: "default" 0.0;
-            align: 1.0 0.5;
+            align: 1.0 0.0;
             rel1 {
                 relative: 1.0 0.0;
             }
             rel2 {
-                relative: 1.0 0.5;
+                relative: 1.0 0.0;
             }
-            min: 10 0;
-            fixed: 1 0;
+            min: 10 10;
+            fixed: 1 1;
             visible: 0;
          }
          description { state: "default" 0.10;
             inherit: "default" 0.0;
-            min: 10 0;
+            min: 10 10;
          }
          description { state: "default" 0.06;
             inherit: "default" 0.0;
-            min: 6 0;
+            min: 6 10;
          }
          description { state: "default" 0.04;
             inherit: "default" 0.0;
-            min: 4 0;
+            min: 4 10;
          }
       }
       part { name: "elm.image.badge";
@@ -1242,7 +1254,7 @@ group { name: "elm/toolbar/item/tabbar";
             }
             image {
                normal: "00_badge_bg.png";
-               border: 29 24 0 0;
+               border: 27 26 0 0;
                border_scale: 1;
             }
          }
@@ -1258,16 +1270,16 @@ group { name: "elm/toolbar/item/tabbar";
             state: "default" 0.0;
             visible: 0;
             fixed: 1 1;
-            min: 13 54;
+            min: 12 54;
             rel1 {
                to: "elm.text.badge";
-               relative: 0.0 1.0;
+               relative: 0.0 0.0;
             }
             rel2 {
                to: "elm.text.badge";
                relative: 0.0 1.0;
             }
-            align: 1.0 1.0;
+            align: 1.0 0.0;
          }
       }
       part { name: "right.padding.text";
@@ -1277,7 +1289,7 @@ group { name: "elm/toolbar/item/tabbar";
             state: "default" 0.0;
             visible: 0;
             fixed: 1 1;
-            min: 8 54;
+            min: 12 54;
             rel1 {
                to: "padding.badge";
                relative: 0.0 1.0;
@@ -1286,7 +1298,7 @@ group { name: "elm/toolbar/item/tabbar";
                to: "padding.badge";
                relative: 0.0 1.0;
             }
-            align: 1.0 1.0;
+            align: 1.0 0.0;
          }
       }
       part { name: "elm.text.badge";
@@ -1304,14 +1316,15 @@ group { name: "elm/toolbar/item/tabbar";
                to: "right.padding.text";
                relative: 0.0 1.0;
             }
-            min: 33 0;
+            min: 30 0;
             fixed: 1 0;
             align: 1.0 0.5;
-            color: 10 100 208 255;
+            color: 250 250 250 255;
             text {
                font: "Tizen:style=Bold";
-               size: 26;
-               min: 1 1;
+               size: 34;
+               min: 1 0;
+               text_class: "tizen";
             }
          }
          description { state: "visible" 0.0;
@@ -1573,7 +1586,7 @@ group { name: "elm/toolbar/item/tabbar";
          description { state: "default" 0.0;
             visible: 0;
             image {
-                normal: "00_focus.png";
+                normal: "00_tab_focus.png";
                 border: 8 8 8 8;
                 border_scale: 1;
             }
@@ -1605,7 +1618,7 @@ group { name: "elm/toolbar/item/tabbar";
             fixed: 1 1;
             align: 1.0 0.0;
             text {
-               style: "toolbar_text_style_30";
+               style: "tabbar_text_style_30";
                text: "test";
                min: 1 1;
             }
@@ -1921,6 +1934,83 @@ group { name: "elm/toolbar/item/tabbar";
          action: STATE_SET "default" 0.0;
          target: "highlight";
       }
+      program { name: "tab_item_2";
+         signal: "elm,number,item,2";
+         source: "elm";
+         script {
+            set_int(items_number, 2);
+            set_state(PART:"padding.badge", "default", 0.10);
+         }
+      }
+      program { name: "tab_item_3";
+         signal: "elm,number,item,3";
+         source: "elm";
+         script {
+            set_int(items_number, 3);
+            set_state(PART:"padding.badge", "default", 0.06);
+         }
+      }
+      program { name: "tab_item_4";
+         signal: "elm,number,item,4";
+         source: "elm";
+         script {
+            set_int(items_number, 4);
+         }
+         after: "tab_item_upper_4";
+      }
+      program { name: "tab_item_5";
+         signal: "elm,number,item,5";
+         source: "elm";
+         script {
+            set_int(items_number, 5);
+         }
+         after: "tab_item_upper_4";
+      }
+      program { name: "tab_item_6";
+         signal: "elm,number,item,6";
+         source: "elm";
+         script {
+            set_int(items_number, 6);
+         }
+         after: "tab_item_upper_4";
+      }
+      program { name: "tab_item_7";
+         signal: "elm,number,item,7";
+         source: "elm";
+         script {
+            set_int(items_number, 7);
+         }
+         after: "tab_item_upper_4";
+      }
+      program { name: "tab_item_8";
+         signal: "elm,number,item,8";
+         source: "elm";
+         script {
+            set_int(items_number, 8);
+         }
+         after: "tab_item_upper_4";
+      }
+      program { name: "tab_item_9";
+         signal: "elm,number,item,9";
+         source: "elm";
+         script {
+            set_int(items_number, 9);
+         }
+         after: "tab_item_upper_4";
+      }
+      program { name: "tab_item_10";
+         signal: "elm,number,item,10";
+         source: "elm";
+         script {
+            set_int(items_number, 10);
+         }
+         after: "tab_item_upper_4";
+      }
+      program { name: "tab_item_upper_4";
+         script {
+            set_state(PART:"padding.badge", "default", 0.04);
+         }
+      }
       program { name: "slide_start";
          script {
             if (!get_int(sliding_timer) && !get_int(end_timer)) {