[naviframe & segment control] Fix not to use 00_divider_line.png as divider

Change-Id: I47df255d755182b237c857b75bab641d5445dff0

diff --git a/themes/images/tizen-hd/Others/00_divider_line.png b/themes/images/tizen-hd/Others/00_divider_line.png
deleted file mode 100644 (file)
index fa2f19e..0000000
Binary files a/themes/images/tizen-hd/Others/00_divider_line.png and /dev/null differ

diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc
index c64c5f2..3c9db1b 100644 (file)
--- a/themes/inc/tizen-hd-inc.edc
+++ b/themes/inc/tizen-hd-inc.edc
@@ -91,6 +91,8 @@
 #define NAVIFRAME_LANDSCAPE_SUBTITLE_HEIGHT_INC 30
 #define NAVIFRAME_TITLE_TEXT_UNSELECTED_COLOR_INC 153 153 153 255
 #define NAVIFRAME_BADGE_TEXT_COLOR_INC 10 100 208 255;
+#define NAVIFRAME_DUAL_TITLE_DIVIDER_LEFT_COLOR_INC 211 209 203 255
+#define NAVIFRAME_DUAL_TITLE_DIVIDER_RIGHT_COLOR_INC 255 255 255 255
 
 #define PROGRESSBAR_TITLE_FONT_SIZE_INC 28
 #define PROGRESSBAR_STATUS_TEXT_FONT_SIZE_INC 20
@@ -689,7 +691,9 @@
 #define SEGMENT_CONTROL_MULTILINE_TEXT_SIZE_INC 30
 #define SEGMENT_CONTROL_TEXT_SIZE_RANGE_MIN_INC 12
 #define SEGMENT_CONTROL_TEXT_SIZE_RANGE_MAX_INC 28
-#define SEGMENT_CONTROL_DIVIDER_LINE_MIN_SIZE_INC 2 32
+#define SEGMENT_CONTROL_DIVIDER_LINE_MIN_SIZE_INC 4 32
+#define SEGMENT_CONTROL_DIVIDER_LEFT_COLOR_INC 211 209 203 255
+#define SEGMENT_CONTROL_DIVIDER_RIGHT_COLOR_INC 255 255 255 255
 #define SEGMENT_CONTROL_TEXT_PADDING_MIN_SIZE_INC 18 0
 #define SEGMENT_CONTROL_VISIBLE_ICON_RECT_MIN_MAX_INC 40 40
 #define SEGMENT_CONTROL_BADGE_TEXT_LEFT_PADDING_MIN_INC 22 45

diff --git a/themes/widgets/naviframe.edc b/themes/widgets/naviframe.edc
index 4e1c745..9806170 100644 (file)
--- a/themes/widgets/naviframe.edc
+++ b/themes/widgets/naviframe.edc
@@ -3138,7 +3138,6 @@
    group { name: "elm/naviframe/item/dual_title/default";
       images {
          image: "00_badge_bg.png" COMP;
-         image: "00_divider_line.png" COMP;
       }
       script {
          public tbar_bg = 0;     //Toolbar BG Show call count
@@ -3367,9 +3366,8 @@
                visible: 0;
             }
          }
-         part { name: "separator";
-            type: IMAGE;
-            scale: 1;
+         part { name: "divider";
+            type: RECT;
             description { state: "default" 0.0;
                min: 4 26;
                max: 4 26;
@@ -3377,10 +3375,24 @@
                rel1.to: "text.padding";
                rel2.to: "text.padding";
                align: 0.5 0.5;
-               image {
-                   normal: "00_divider_line.png";
-                   border: 0 0 2 2;
-               }
+            }
+         }
+         part { name: "divider_left";
+            type: RECT;
+            clip_to: "divider";
+            description { state: "default" 0.0;
+               color: NAVIFRAME_DUAL_TITLE_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: NAVIFRAME_DUAL_TITLE_DIVIDER_RIGHT_COLOR_INC;
+               rel1 { relative: 0.5 0.0; to: "divider"; }
+               rel2 { relative: 1.0 1.0; to: "divider"; }
             }
          }
          part { name: "elm.text.title2";
@@ -3450,8 +3462,8 @@
                visible: 0;
                min: 0 0;
                fixed: 1 1;
-               rel1 { relative: 0.0 1.0; to_x: "separator"; to_y: "badge_top_padding"; }
-               rel2 { relative: 0.0 0.5; to_x: "separator"; to_y: "title_bg"; }
+               rel1 { relative: 0.0 1.0; to_x: "divider"; to_y: "badge_top_padding"; }
+               rel2 { relative: 0.0 0.5; to_x: "divider"; to_y: "title_bg"; }
                align: 0.0 0.5;
             }
             description { state: "visible" 0.0;

diff --git a/themes/widgets/segmentedcontrol.edc b/themes/widgets/segmentedcontrol.edc
index 64fb221..6eb0fd9 100644 (file)
--- a/themes/widgets/segmentedcontrol.edc
+++ b/themes/widgets/segmentedcontrol.edc
@@ -55,7 +55,6 @@ group { name: "elm/segment_control/item/default";
       }
    }
    images {
-      image: "00_divider_line.png" COMP;
       image: "00_badge_bg.png" COMP;
    }
    parts {
@@ -126,7 +125,7 @@ group { name: "elm/segment_control/item/default";
          }
       }
       part { name: "seg_padding";
-         scale: 1;
+         type: RECT;
          mouse_events: 0;
          description { state: "default" 0.0;
             visible: 0;
@@ -141,10 +140,6 @@ group { name: "elm/segment_control/item/default";
                to: "segment";
                relative: 1.0 0.5;
             }
-            image {
-               normal: "00_divider_line.png";
-               border_scale: 1;
-            }
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
@@ -152,6 +147,38 @@ group { name: "elm/segment_control/item/default";
             visible: 1;
          }
       }
+      part { name: "divider_left";
+         type: RECT;
+         clip_to: "seg_padding";
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1 {
+               to: "seg_padding";
+               relative: 0.0 0.0;
+            }
+            rel2 {
+               to: "seg_padding";
+               relative: 0.5 1.0;
+            }
+            color: SEGMENT_CONTROL_DIVIDER_LEFT_COLOR_INC;
+         }
+      }
+      part { name: "divider_right";
+         type: RECT;
+         clip_to: "seg_padding";
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1 {
+               to: "seg_padding";
+               relative: 0.5 0.0;
+            }
+            rel2 {
+               to: "seg_padding";
+               relative: 1.0 1.0;
+            }
+            color: SEGMENT_CONTROL_DIVIDER_RIGHT_COLOR_INC;
+         }
+      }
       part { name: "left_text_padding";
          type: RECT;
          scale: 1;