[toolbar] add the tabbar style including indicator area.

diff --git a/themes/widgets/layout.edc b/themes/widgets/layout.edc
index 34b6ccc..02da240 100644 (file)
--- a/themes/widgets/layout.edc
+++ b/themes/widgets/layout.edc
@@ -124,10 +124,10 @@
          }
       }
    }
-   /*************************************************/
-   /* elm_layout -> tabbar template style       */
-   /*************************************************/
-   group { name: "elm/layout/tabbar/default";
+   /************************************************************/
+   /* elm_layout -> fundamental template style with tabbar */
+   /************************************************************/
+   group { name: "elm/layout/application/tabbar";
       parts {
          part { name: "elm.swallow.bg";
             type: SWALLOW;
@@ -135,12 +135,48 @@
             description { state: "default" 0.0;
             }
          }
+         part { name: "indicator";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 LAYOUT_INDICATOR_HEIGHT_INC;
+               max: 999999 LAYOUT_INDICATOR_HEIGHT_INC;
+               fixed: 0 1;
+               align: 0.5 0;
+               color: LAYOUT_INDICATOR_COLOR_INC;
+            }
+         }
+         part { name: "elm.swallow.tabbar";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 CONTROLBAR_LARGE_HEIGHT_INC;
+               fixed: 0 1;
+               rel1 { relative: 0.0 1.0; to_y: "indicator";}
+               rel2 { relative: 1.0 1.0; to_y: "indicator";}
+               align: 0.5 0.0;
+            }
+         }
          part { name: "elm.swallow.content";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
+               rel1.to_y: "elm.swallow.tabbar";
                rel1.relative: 0.0 1.0;
-               rel1.to: "elm.swallow.tabbar";
+            }
+         }
+      }
+   }
+
+   /*************************************************/
+   /* elm_layout -> tabbar template style       */
+   /*************************************************/
+   group { name: "elm/layout/tabbar/default";
+      parts {
+         part { name: "elm.swallow.bg";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
             }
          }
          part { name: "elm.swallow.tabbar";
@@ -154,6 +190,14 @@
                align: 0.5 0.0;
             }
          }
+         part { name: "elm.swallow.content";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1.relative: 0.0 1.0;
+               rel1.to: "elm.swallow.tabbar";
+            }
+         }
       }
    }
    /*************************************************/

diff --git a/themes/widgets/toolbar.edc b/themes/widgets/toolbar.edc
index 76f5652..82f4642 100644 (file)
--- a/themes/widgets/toolbar.edc
+++ b/themes/widgets/toolbar.edc
@@ -855,6 +855,7 @@ group { name: "elm/toolbar/object/default";
 }
 
 group { name: "elm/toolbar/base/tabbar";
+   alias: "elm/toolbar/base/tabbar/item_horizontal";
    images {
       image: "00_winset_control_tabbar_bg_top.png" COMP;
    }
@@ -902,7 +903,6 @@ group { name: "elm/toolbar/base/tabbar";
 }
 
 group { name: "elm/toolbar/item/tabbar";
-   alias: "elm/toolbar/item/tabbar/item_horizontal";
    images {
       image: "00_winset_tabbar_focus.png" COMP;
    }