[badge]changed toolbar and naviframe badge image size

[platform/core/uifw/efl-theme-tizen.git] / themes / widgets / toolbar.edc

diff --git a/themes/widgets/toolbar.edc b/themes/widgets/toolbar.edc
index 8451cb3..254929b 100644 (file)
--- a/themes/widgets/toolbar.edc
+++ b/themes/widgets/toolbar.edc
@@ -50,14 +50,12 @@ styles{
 }
 
 group { name: "elm/toolbar/base/default";
-   images {
-      image: "00_winset_control_toolbar_bg.png" COMP;
-   }
    parts {
       part { name: "base";
+         type: RECT;
          mouse_events: 1;
          description { state: "default" 0.0;
-            image.normal: "00_winset_control_toolbar_bg.png";
+            color: 248 246 239 255;
          }
       }
       part { name: "clipper";
@@ -97,7 +95,7 @@ group { name: "elm/toolbar/base/default";
 
 group { name: "elm/toolbar/item/default";
    images {
-      image: "00_winset_toolbar_press.png" COMP;
+      image: "00_tab_press.png" COMP;
    }
 
    data.item: "transition_animation_on" "1";
@@ -120,7 +118,7 @@ group { name: "elm/toolbar/item/default";
                offset: TOOLBAR_ITEM_BG_REL2_OFFSET_INC;
             }
             image {
-               normal: "00_winset_toolbar_press.png";
+               normal: "00_tab_press.png";
                border: TOOLBAR_ITEM_BG_SELECTED_BORDER_INC;
             }
             image.middle: SOLID;
@@ -993,22 +991,49 @@ group { name: "elm/toolbar/item/item_horizontal";
 }
 
 group { name: "elm/toolbar/separator/default";
-   images {
-      image: "00_winset_divider_line.png" COMP;
-   }
    parts {
-      part { name: "base";
-         type: IMAGE;
+      part { name: "divider";
+         type: RECT;
          scale: 1;
          description { state: "default" 0.0;
-            min: 4 48;
+            min: 4 26;
             max: 4 9999;
             fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel2.relative: 0.0 0.5;
-            image {
-                normal: "00_winset_divider_line.png";
-                border: 0 0 2 2;
+            rel1 {
+                relative: 0.5 0.5;
+            }
+            rel2 {
+                relative: 0.5 0.5;
+            }
+         }
+      }
+      part { name: "divider_left";
+         type: RECT;
+         clip_to: "divider";
+         description { state: "default" 0.0;
+            color: TABBAR_ITEM_DIVIDER_LEFT_COLOR_INC;
+            rel1 {
+                relative: 0.0 0.0;
+                to: "divider";
+            }
+            rel2 {
+                relative: 0.5 1.0;
+                to: "divider";
+            }
+         }
+      }
+      part { name: "divider_right";
+         type: RECT;
+         clip_to: "divider";
+         description { state: "default" 0.0;
+            color: TABBAR_ITEM_DIVIDER_RIGHT_COLOR_INC;
+            rel1 {
+                relative: 0.5 0.0;
+                to: "divider";
+            }
+            rel2 {
+                relative: 1.0 1.0;
+                to: "divider";
             }
          }
       }
@@ -1225,173 +1250,6 @@ group { name: "elm/toolbar/base/tabbar";
    }
 }
 
-group { name: "elm/toolbar/more/tabbar";
-   images {
-      image: "00_winset_control_tab_h_line_h.png" COMP;
-   }
-   parts {
-      part { name: "base";
-         type: RECT;
-         mouse_events: 1;
-         description { state: "default" 0.0;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-            color: 248 246 239 255;
-         }
-         description { state: "open" 0.0;
-            inherit: "default" 0.0;
-            rel2.relative: 1.0 1.0;
-         }
-         description { state: "open2" 0.0;
-            inherit: "default" 0.0;
-            rel2.relative: 1.0 2.0;
-         }
-      }
-      part { name: "clipper";
-         type: RECT;
-         mouse_events: 0;
-         description {
-            state: "default" 0.0;
-            fixed: 1 1;
-            rel1 {
-               to: "base";
-            }
-            rel2 {
-               to: "base";
-            }
-         }
-         description { state: "open" 0.0;
-            inherit: "default" 0.0;
-            rel2.relative: 1.0 1.0;
-         }
-         description { state: "open2" 0.0;
-            inherit: "default" 0.0;
-            rel2.relative: 1.0 0.5;
-         }
-      }
-      part { name: "clipper2";
-         type: RECT;
-         mouse_events: 0;
-         description {
-            state: "default" 0.0;
-            fixed: 1 1;
-            rel1 {
-               relative: 0.0 0.5;
-               to: "base";
-            }
-            rel2 {
-               to: "base";
-            }
-         }
-         description { state: "open" 0.0;
-            inherit: "default" 0.0;
-            rel1.relative: 0.0 1.0;
-         }
-         description { state: "open2" 0.0;
-            inherit: "default" 0.0;
-            rel1.relative: 0.0 0.5;
-         }
-      }
-      part { name: "elm.swallow.content";
-         clip_to: "clipper";
-         type: SWALLOW;
-         description {
-            state: "default" 0.0;
-            fixed: 1 1;
-            rel1.to: "clipper";
-            rel2.to: "clipper";
-         }
-      }
-      part { name: "elm.swallow.content2";
-         clip_to: "clipper2";
-         type: SWALLOW;
-         description {
-            state: "default" 0.0;
-            fixed: 1 1;
-            rel1.to: "clipper2";
-            rel2.to: "clipper2";
-         }
-      }
-      part { name: "separator";
-         clip_to: "clipper";
-         description { state: "default" 0.0;
-            min: 2 3;
-            max: 9999 3;
-            fixed: 1 1;
-            rel1 {
-                relative: 0.0 0.0;
-                offset: 0 0;
-                to: "clipper";
-            }
-            rel2 {
-                relative: 1.0 0.0;
-                offset: -1 3;
-                to: "clipper";
-            }
-            image {
-               normal: "00_winset_control_tab_h_line_h.png";
-               border: 1 1 1 1;
-            }
-            fill {
-               smooth: 0;
-            }
-         }
-      }
-      part { name: "separator2";
-         clip_to: "clipper2";
-         description { state: "default" 0.0;
-            min: 2 3;
-            max: 9999 3;
-            fixed: 1 1;
-            rel1 {
-                relative: 0.0 0.0;
-                offset: 0 0;
-                to: "clipper2";
-            }
-            rel2 {
-                relative: 1.0 0.0;
-                offset: -1 3;
-                to: "clipper2";
-            }
-            image {
-               normal: "00_winset_control_tab_h_line_h.png";
-               border: 1 1 1 1;
-            }
-            fill {
-               smooth: 0;
-            }
-         }
-      }
-   }
-   programs {
-      program { name: "open";
-         signal:  "elm,state,open";
-         source:  "elm";
-         action:  STATE_SET "open" 0.0;
-         target:  "base";
-         target:  "clipper";
-         target:  "clipper2";
-         transition: LINEAR 0.2;
-      }
-      program { name: "open2";
-         signal:  "elm,state,open2";
-         source:  "elm";
-         action:  STATE_SET "open2" 0.0;
-         target:  "base";
-         target:  "clipper";
-         target:  "clipper2";
-         transition: LINEAR 0.2;
-      }
-      program { name: "close";
-         signal:  "elm,state,close";
-         source:  "elm";
-         action:  STATE_SET "default" 0.0;
-         target:  "base";
-         transition: LINEAR 0.2;
-      }
-   }
-}
-
 group { name: "elm/toolbar/item/tabbar";
    images {
       image: "00_tab_press.png" COMP;
@@ -1403,6 +1261,8 @@ group { name: "elm/toolbar/item/tabbar";
    script {
       public item_state = ITEM_STATE_ENABLED;
       public items_number = 0;
+      public selected = 0;
+      public temp;
    }
    parts {
       part { name: "bg";
@@ -1825,7 +1685,7 @@ group { name: "elm/toolbar/item/tabbar";
          scale: 1;
          description { state: "default" 0.0;
             visible: 0;
-            min: 54 48;
+            min: 54 54;
             fixed: 1 1;
             rel1 {
                to: "left.padding.text";
@@ -1853,7 +1713,7 @@ group { name: "elm/toolbar/item/tabbar";
             state: "default" 0.0;
             visible: 0;
             fixed: 1 1;
-            min: 13 47;
+            min: 13 54;
             rel1 {
                to: "elm.text.badge";
                relative: 0.0 1.0;
@@ -1872,7 +1732,7 @@ group { name: "elm/toolbar/item/tabbar";
             state: "default" 0.0;
             visible: 0;
             fixed: 1 1;
-            min: 8 48;
+            min: 8 54;
             rel1 {
                to: "padding.badge";
                relative: 0.0 1.0;
@@ -1899,7 +1759,7 @@ group { name: "elm/toolbar/item/tabbar";
                to: "right.padding.text";
                relative: 0.0 1.0;
             }
-            min: 25 0;
+            min: 33 0;
             fixed: 1 0;
             align: 1.0 0.5;
             color: 10 100 208 255;
@@ -2089,6 +1949,7 @@ group { name: "elm/toolbar/item/tabbar";
          script{
             new st[31];
             new Float:vl;
+            set_int(selected, 1);
             get_state(PART:"elm.text", st, 30, vl);
             if (!strcmp(st, "visible"))
               set_state(PART:"elm.text", "selected", vl);
@@ -2107,6 +1968,7 @@ group { name: "elm/toolbar/item/tabbar";
          script{
             new st[31];
             new Float:vl;
+            set_int(selected, 0);
             get_state(PART:"elm.text", st, 30, vl);
             if (!strcmp(st, "selected"))
               set_state(PART:"elm.text", "visible", vl);
@@ -2298,17 +2160,23 @@ group { name: "elm/toolbar/item/tabbar";
             get_state(PART:"elm.text", st, 30, vl);
             if (!strcmp(st, "default"))
               {
+                if (get_int(selected))
+                  set_str(temp, "selected");
+                else
+                  set_str(temp, "visible");
+                get_str(temp, st, 31);
+
                 if (get_int(items_number) <= 2)
-                  set_state(PART:"elm.text", "visible", 0.30);
+                  set_state(PART:"elm.text", st, 0.30);
                 else if (get_int(items_number) == 3)
-                  set_state(PART:"elm.text", "visible", 0.28);
+                  set_state(PART:"elm.text", st, 0.28);
                 else if (get_int(items_number) >= 4)
                   {
                     get_state(PART:"bg", st, 30, vl);
                     if (!strcmp(st, "icon_text"))
-                      set_state(PART:"elm.text", "visible", 0.28);
+                      set_state(PART:"elm.text", st, 0.28);
                     else
-                      set_state(PART:"elm.text", "visible", 0.24);
+                      set_state(PART:"elm.text", st, 0.24);
                   }
               }
          }