navigationbar_ex - separate title item separator and it's shadow and makes it disable...

diff --git a/themes/groups/navigationbar_ex.edc b/themes/groups/navigationbar_ex.edc
index cebbeb4..500012c 100644 (file)
--- a/themes/groups/navigationbar_ex.edc
+++ b/themes/groups/navigationbar_ex.edc
@@ -1,3 +1,28 @@
+/*
+ *  nBeat-theme
+ *
+ * Copyright (c) 2000 - 2010 Samsung Electronics Co., Ltd.
+ *
+ * Contact: Seokjae Jeong <seok.j.jeong@samsung.com>, Myoungwoon Roy Kim <Myoungwoon.kim@samsung.com>, Jeonghyun Yun <jh0506.yun@samsung.com>, Jaehwan Kim <jae.hwan.kim@samsung.com>,
+ *       Chuneon Park <chuneon.park@samsung.com>, Juyung Seo <juyung.seo@samsung.com>, Woohyun Jung <wh0705.jung@samsung.com>, Myungjae Lee <mjae.lee@samsung.com>, Hyoyoung Chang <hyoyoung.chang@samsung.com>,
+ *    Hyunsil Park <hyunsil.park@samsung.com>, Sohyun Kim <anna1014.kim@samsung.com>, Seunggyun Kim <sgyun.kim@samsung.com>
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
 #define NAVIBAR_EX_EXTENDED_H 115
 #define NAVIBAR_EX_EXTENDED_H2 186
 #define NAVIBAR_EX_TITLE_SEPARATOR_H 5
@@ -167,7 +192,7 @@ group { name: "elm/navigationbar_ex/item/title/default";
          mouse_events: 0;
          repeat_events: 1;
          description { state: "default" 0.0;
-            min: 1 (NAVI_BAR_H + NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H);
+            min: 1 NAVI_BAR_H;
             fixed: 1 1;
             rel2.relative: 1.0 0.0;
             align: 0.0 0.0;
@@ -178,7 +203,7 @@ group { name: "elm/navigationbar_ex/item/title/default";
          }
          description { state: "extended" 0.0;
             inherit: "default" 0.0;
-            min: 1 (NAVIBAR_EX_EXTENDED_H + NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H);
+            min: 1 NAVIBAR_EX_EXTENDED_H;
          }
       }
       part { name: "navigationitem";
@@ -320,7 +345,7 @@ group { name: "elm/navigationbar_ex/item/title/default";
          scale: 1;
          description { state: "default" 0.0;
             align: 0.0 0.0;
-            rel1 { relative: 0.0 1.0; to: "base"; offset: 0 -NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H; }
+            rel1 { relative: 0.0 1.0; to: "base"; }
             rel2 { relative: 1.0 1.0; }
          }
          description { state: "top" 0.0;
@@ -331,15 +356,15 @@ group { name: "elm/navigationbar_ex/item/title/default";
       part { name: "navigationitem_separator";
          type: IMAGE;
          mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
-            min: 1 (NAVIBAR_EX_TITLE_SEPARATOR_H + NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H);
+            min: 1 NAVIBAR_EX_TITLE_SEPARATOR_H;
             fixed: 0 1;
             align: 0.5 1;
             rel1 { to: "navigationitem"; relative: 0 1; }
             rel2 { to: "base"; relative: 1 1; }
             image { normal: "navibar_item_separator.png";
-                border: 0 0 1 6;
-                border_scale: 1;
+                border: 0 0 1 0;
             }
          }
       }
@@ -397,13 +422,14 @@ group { name: "elm/navigationbar_ex/item/title/default";
 group { name: "elm/navigationbar_ex/item/title_option_header/default";
    images {
       image: "navibar_item_separator.png" COMP;
+      image: "navibar_item_separator_shadow.png" COMP;
    }
    parts {
       part { name: "base";
          mouse_events: 0;
          repeat_events: 1;
          description { state: "default" 0.0;
-            min: 1 (NAVIBAR_EX_EXTENDED_H + NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H);
+            min: 1 NAVIBAR_EX_EXTENDED_H;
             fixed: 1 1;
             rel2.relative: 1.0 0.0;
             align: 0.0 0.0;
@@ -414,7 +440,7 @@ group { name: "elm/navigationbar_ex/item/title_option_header/default";
          }
          description { state: "closed" 0.0;
             inherit: "default" 0.0;
-            min: 1 (NAVI_BAR_H + NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H);
+            min: 1 NAVI_BAR_H;
          }
       }
       part { name: "navigationitem";
@@ -565,7 +591,7 @@ group { name: "elm/navigationbar_ex/item/title_option_header/default";
          clip_to: "clip_content";
          description { state: "default" 0.0;
             align: 0.0 0.0;
-            rel1 { relative: 0.0 1.0; to: "base"; offset: 0 -NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H; }
+            rel1 { relative: 0.0 1.0; to: "base"; }
             rel2 { relative: 1.0 1.0; }
          }
          description { state: "top" 0.0;
@@ -576,18 +602,36 @@ group { name: "elm/navigationbar_ex/item/title_option_header/default";
       part { name: "navigationitem_separator";
          type: IMAGE;
          mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
-            min: 1 (NAVIBAR_EX_TITLE_SEPARATOR_H + NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H);
+            min: 1 NAVIBAR_EX_TITLE_SEPARATOR_H;
             fixed: 0 1;
             align: 0.5 1;
             rel1 { to: "navigationitem"; relative: 0 1; }
             rel2 { to: "base"; relative: 1 1; }
             image { normal: "navibar_item_separator.png";
-                border: 0 0 1 6;
-                border_scale: 1;
+                border: 0 0 1 0;
             }
          }
       }
+      part { name: "navigationitem_separator_shadow";
+         type: IMAGE;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: 1 NAVIBAR_TITLE_SEPARATOR_SHADOW_H;
+            fixed: 0 1;
+            align: 0.5 0;
+            color: 255 255 255 255;
+            rel1 { to: "navigationitem_separator"; relative: 0 1; }
+            rel2 { to: "navigationitem_separator"; relative: 1 1; }
+            image { normal: "navibar_item_separator_shadow.png"; }
+         }
+         description { state: "closed" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 0;
+         }
+      }
       part {
          name: "naviarrow";
          type: IMAGE;
@@ -607,7 +651,6 @@ group { name: "elm/navigationbar_ex/item/title_option_header/default";
             }
          }
       }
-
       part { name: "elm.swallow.title";
          type: SWALLOW;
          scale: 1;
@@ -649,6 +692,7 @@ group { name: "elm/navigationbar_ex/item/title_option_header/default";
          action: STATE_SET "default" 0.0;
          target: "base";
          target: "elm.swallow.content";
+         target: "navigationitem_separator_shadow";
       }
       program {
          name: "extended_titlearea";
@@ -657,6 +701,7 @@ group { name: "elm/navigationbar_ex/item/title_option_header/default";
          action: STATE_SET "default" 0.0;
          target: "base";
          target: "elm.swallow.title";
+         target: "navigationitem_separator_shadow";
          transition: LINEAR 0.2;
       }
       program {
@@ -666,6 +711,7 @@ group { name: "elm/navigationbar_ex/item/title_option_header/default";
          action: STATE_SET "closed" 0.0;
          target: "base";
          target: "elm.swallow.title";
+         target: "navigationitem_separator_shadow";
          transition: LINEAR 0.2;
       }
       program {
@@ -688,13 +734,14 @@ group { name: "elm/navigationbar_ex/item/title_option_header/default";
 group { name: "elm/navigationbar_ex/item/title_option_header2/default";
    images {
       image: "navibar_item_separator.png" COMP;
+      image: "navibar_item_separator_shadow.png" COMP;
    }
    parts {
       part { name: "base";
          mouse_events: 0;
          repeat_events: 1;
          description { state: "default" 0.0;
-            min: 1 (NAVIBAR_EX_EXTENDED_H2 + NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H);
+            min: 1 NAVIBAR_EX_EXTENDED_H2;
             fixed: 1 1;
             rel2.relative: 1.0 0.0;
             align: 0.0 0.0;
@@ -705,7 +752,7 @@ group { name: "elm/navigationbar_ex/item/title_option_header2/default";
          }
          description { state: "closed" 0.0;
             inherit: "default" 0.0;
-            min: 1 (NAVI_BAR_H + NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H);
+            min: 1 NAVI_BAR_H;
          }
       }
       part { name: "navigationitem";
@@ -856,7 +903,7 @@ group { name: "elm/navigationbar_ex/item/title_option_header2/default";
          clip_to: "clip_content";
          description { state: "default" 0.0;
             align: 0.0 0.0;
-            rel1 { relative: 0.0 1.0; to: "base"; offset: 0 -NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H; }
+            rel1 { relative: 0.0 1.0; to: "base"; }
             rel2 { relative: 1.0 1.0; }
          }
          description { state: "top" 0.0;
@@ -867,18 +914,36 @@ group { name: "elm/navigationbar_ex/item/title_option_header2/default";
       part { name: "navigationitem_separator";
          type: IMAGE;
          mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
-            min: 1 (NAVIBAR_EX_TITLE_SEPARATOR_H + NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H);
+            min: 1 NAVIBAR_EX_TITLE_SEPARATOR_H;
             fixed: 0 1;
             align: 0.5 1;
             rel1 { to: "navigationitem"; relative: 0 1; }
             rel2 { to: "base"; relative: 1 1; }
             image { normal: "navibar_item_separator.png";
-                border: 0 0 0 6;
-                border_scale: 1;
+                border: 0 0 1 0;
             }
          }
       }
+      part { name: "navigationitem_separator_shadow";
+         type: IMAGE;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: 1 NAVIBAR_TITLE_SEPARATOR_SHADOW_H;
+            fixed: 0 1;
+            align: 0.5 0;
+            color: 255 255 255 255;
+            rel1 { to: "navigationitem_separator"; relative: 0 1; }
+            rel2 { to: "navigationitem_separator"; relative: 1 1; }
+            image { normal: "navibar_item_separator_shadow.png"; }
+         }
+         description { state: "closed" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 0;
+         }
+      }
       part {
          name: "naviarrow";
          type: IMAGE;
@@ -939,6 +1004,7 @@ group { name: "elm/navigationbar_ex/item/title_option_header2/default";
          action: STATE_SET "default" 0.0;
          target: "base";
          target: "elm.swallow.content";
+         target: "navigationitem_separator_shadow";
       }
       program {
          name: "extended_titlearea";
@@ -947,6 +1013,7 @@ group { name: "elm/navigationbar_ex/item/title_option_header2/default";
          action: STATE_SET "default" 0.0;
          target: "base";
          target: "elm.swallow.title";
+         target: "navigationitem_separator_shadow";
          transition: LINEAR 0.2;
       }
       program {
@@ -956,6 +1023,7 @@ group { name: "elm/navigationbar_ex/item/title_option_header2/default";
          action: STATE_SET "closed" 0.0;
          target: "base";
          target: "elm.swallow.title";
+         target: "navigationitem_separator_shadow";
          transition: LINEAR 0.2;
       }
       program {