naviframe - updated segment style according to white ux 0.8

diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc
index 8c84e4a..cc28f86 100644 (file)
--- a/themes/inc/tizen-hd-inc.edc
+++ b/themes/inc/tizen-hd-inc.edc
@@ -28,7 +28,7 @@
 #define LAYOUT_INDICATOR_COLOR_INC 0 0 0 255
 
 #define NAVIFRAME_TITLE_H_INC 108
-#define NAVIFRAME_SEGMENT_TITLE_H_INC 124
+#define NAVIFRAME_SEGMENT_TITLE_H_INC 126
 #define NAVIFRAME_OH_OPENED_H_INC 106
 #define NAVIFRAME_OH_CONTENT_H_INC 74
 #define NAVIFRAME_OH_PADDING_INC 16
@@ -40,10 +40,10 @@
 #define NAVIFRAME_TEXT_PADDING_INC 142
 #define NAVIFRAME_NO_BUTTON_ICON_PADDING_INC 52
 #define NAVIFRAME_TEXT_PADDING_ICON_VISIBLE_INC 184
-#define NAVIFRAME_TITLE_SEGMENT_H_INC 64
-#define NAVIFRAME_TITLE_SEGMENT_FONT_SIZE_INC 32
+#define NAVIFRAME_TITLE_SEGMENT_H_INC 62
+#define NAVIFRAME_TITLE_SEGMENT_FONT_SIZE_INC 38
 #define NAVIFRAME_SUBTITLE_FONT_SIZE_INC 32
-#define NAVIFRAME_TITLE_SEGMENT_TEXT_H_INC 50
+#define NAVIFRAME_TITLE_SEGMENT_TEXT_H_INC 54
 #define NAVIFRAME_TITLE_FONT_SIZE_INC 40
 #define NAVIFRAME_ICON_SIZE_INC 32 32
 #define NAVIFRAME_ICON_PADDING_INC 16 0

diff --git a/themes/widgets/naviframe.edc b/themes/widgets/naviframe.edc
index 59703ff..9704472 100644 (file)
--- a/themes/widgets/naviframe.edc
+++ b/themes/widgets/naviframe.edc
@@ -1921,9 +1921,6 @@
       script {
          public cbar_bg = 0;     //Controlbar BG Show call count
       }
-      images {
-         image: "00_winset_title_line.png" COMP;
-      }
       parts {
          part { name: "base";
             type: RECT;
@@ -1991,52 +1988,32 @@
                rel2.to: "elm.swallow.content";
             }
          }
-         part { name: "padding_center_text";
+         part { name: "left_padding";
             type: RECT;
             scale: 1;
             mouse_events: 0;
-            clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: 0 0;
+               align: 0.0 0.5;
+               rel1 { relative: 0.0 0.0; }
+               rel2 { relative: 0.0 1.0; }
                fixed: 1 0;
-               align: 0.0 0.0;
-               rel1 { relative: 0.0 0.0; to: "title_bg"; }
-               rel2 { relative: 0.0 1.0; to: "title_bg"; }
+               min: NAVIFRAME_ICON_PADDING_INC;
                visible: 0;
             }
-            description { state: "icon" 0.0;
-               inherit: "default" 0.0;
-               min: NAVIFRAME_NO_BUTTON_ICON_PADDING_INC 0;
-            }
          }
-         part { name: "padding_before_text";
+         part { name: "right_padding";
             type: RECT;
             scale: 1;
             mouse_events: 0;
-            clip_to: "title_clip";
             description { state: "default" 0.0;
                align: 1.0 0.5;
-               rel1 { relative: 0.0 0.0; to: "elm.text.title"; }
-               rel2 { relative: 0.0 1.0; to: "elm.text.title"; }
+               rel1 { relative: 1.0 0.0; }
+               rel2 { relative: 1.0 1.0; }
                fixed: 1 0;
                min: NAVIFRAME_ICON_PADDING_INC;
                visible: 0;
             }
          }
-         part { name: "elm.swallow.icon";
-            type: SWALLOW;
-            scale: 1;
-            clip_to: "title_clip";
-            description { state: "default" 0.0;
-               max: NAVIFRAME_ICON_SIZE_INC;
-               fixed: 1 1;
-               rel1 { relative: 0.0 0.0; to: "padding_before_text"; }
-               rel2 { relative: 0.0 1.0; to: "padding_before_text"; }
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
-               align: 1.0 0.5;
-            }
-         }
          part { name: "elm.text.title";
             type: TEXT;
             scale: 1;
@@ -2053,11 +2030,11 @@
                max: 999999 NAVIFRAME_TITLE_SEGMENT_TEXT_H_INC;
                fixed: 1 1;
                color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
-               align: 0.5 0;
-               rel1.to_x: "padding_center_text";
-               rel1.to_y: "title_bg";
+               align: 0 0;
+               rel1.to: "left_padding";
                rel1.relative: 1.0 0.0;
-               rel2.to: "title_bg";
+               rel2.to: "right_padding";
+               rel2.relative: 0.0 1.0;
             }
          }
          part { name: "click_event_area";
@@ -2068,41 +2045,7 @@
                 rel2 { to: "title_bg"; }
              }
          }
-         part { name: "segment2";
-            type: "SWALLOW";
-            scale: 1;
-            clip_to: "title_clip";
-            description { state: "default" 0.0;
-               min: 0 NAVIFRAME_TITLE_SEGMENT_H_INC;
-               max: 999999 NAVIFRAME_TITLE_SEGMENT_H_INC;
-               fixed: 0 1;
-               align: 0.5 0;
-               rel1.to_y: "elm.text.title";
-               rel1.to_x: "title_bg";
-               rel1.relative: 0.28 1;
-               rel2.to_y: "elm.text.title";
-               rel2.to_x: "title_bg";
-               rel2.relative: 0.72 1;
-            }
-         }
-         part { name: "segment3";
-            type: "SWALLOW";
-            scale: 1;
-            clip_to: "title_clip";
-            description { state: "default" 0.0;
-               min: 0 NAVIFRAME_TITLE_SEGMENT_H_INC;
-               max: 999999 NAVIFRAME_TITLE_SEGMENT_H_INC;
-               fixed: 0 1;
-               align: 0.5 0;
-               rel1.to_y: "elm.text.title";
-               rel1.relative: 0.2 1;
-               rel1.to_x: "title_bg";
-               rel2.to_y: "elm.text.title";
-               rel2.to_x: "title_bg";
-               rel2.relative: 0.8 1;
-            }
-         }
-         part { name: "segment4";
+         part { name: "segment";
             type: "SWALLOW";
             scale: 1;
             clip_to: "title_clip";
@@ -2111,12 +2054,12 @@
                max: 999999 NAVIFRAME_TITLE_SEGMENT_H_INC;
                fixed: 0 1;
                align: 0.5 0;
+               rel1.to_x: "left_padding";
                rel1.to_y: "elm.text.title";
-               rel1.relative: 0.02 1;
-               rel1.to_x: "title_bg";
+               rel1.relative: 1 1;
+               rel2.to_x: "right_padding";
                rel2.to_y: "elm.text.title";
-               rel2.to_x: "title_bg";
-               rel2.relative: 0.98 1;
+               rel2.relative: 0 1;
             }
          }
          part { name: "controlbar_bg";
@@ -2269,18 +2212,6 @@
             action: STATE_SET "hide" 0.0;
             target: "title_bg";
          }
-         program { name: "icon_show";
-            signal: "elm,state,icon,show";
-            source: "elm";
-            action: STATE_SET "icon" 0.0;
-            target: "padding_center_text";
-         }
-         program { name: "icon_hide";
-            signal: "elm,state,icon,hide";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "padding_center_text";
-         }
          program { name: "prev_btn_show";
             signal: "elm,state,prev_btn,show";
             source: "elm";