[Naviframe]: white theme optimized implementation

diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc
index da4a031..9f9b682 100644 (file)
--- a/themes/inc/tizen-hd-inc.edc
+++ b/themes/inc/tizen-hd-inc.edc
@@ -28,26 +28,22 @@
 #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 114
 #define NAVIFRAME_OH_CONTENT_H_INC 72
 #define NAVIFRAME_OH_PADDING_INC 16
 #define NAVIFRAME_OH_SHADOW_INC 10
 #define NAVIFRAME_OH_ARROW_SIZE_INC 28 24
 #define NAVIFRAME_OH_OPENED_DOUBLE_H_INC 202
-#define NAVIFRAME_PREV_BTN_W_INC 124
 #define NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC 120 72
 #define NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC 144
-#define NAVIFRAME_TEXT_PADDING_INC 142
-#define NAVIFRAME_NO_BUTTON_ICON_PADDING_INC 48
-#define NAVIFRAME_TEXT_PADDING_ICON_VISIBLE_INC 48
-#define NAVIFRAME_TITLE_SEGMENT_H_INC 64
+#define NAVIFRAME_TITLE_SEGMENT_H_INC 62
 #define NAVIFRAME_TITLE_SEGMENT_FONT_SIZE_INC 38
 #define NAVIFRAME_TITLE_SEGMENT_TEXT_H_INC 54
 #define NAVIFRAME_TITLE_FONT_SIZE_INC 52
-#define NAVIFRAME_SUBTITLE_FONT_SIZE_INC 32
 #define NAVIFRAME_ICON_SIZE_INC 32 32
-#define NAVIFRAME_ICON_PADDING_INC 16 0
+#define NAVIFRAME_PADDING_INC 16 0
+#define NAVIFRAME_ICON_PADDING_INC 64 0
 #define NAVIFRAME_TITLE_TEXT_COLOR_INC 249 249 249 255
 #define NAVIFRAME_SUBTITLE_TEXT_COLOR_INC 249 249 249 255
 #define NAVIFRAME_OH_BORDER_INC 1 1 5 1

diff --git a/themes/widgets/naviframe.edc b/themes/widgets/naviframe.edc
index a029fef..1c8bc84 100644 (file)
--- a/themes/widgets/naviframe.edc
+++ b/themes/widgets/naviframe.edc
@@ -39,12 +39,6 @@
          public oh_show = 0;     //optionheader show/hide
          public oh_close = 0;    //optionheader close/open
          public cbar_bg = 0;     //Controlbar BG Show call count
-         public left_btn_visible = 0; //whether left btn is shown
-         public icon_visible = 0; //whether icon is shown
-         public right_btn_visible = 0; //whether right btn is shown
-         public more_btn_visible = 0; //whether more btn is shown
-         public large_padded_center_align = 0; //large padding based on button size for center align for 1/2 buttons.
-         public subtitle_visible = 0; //whether subtitle is shown
       }
       parts {
          part { name: "base";
@@ -198,82 +192,22 @@
                rel2.to: "elm.swallow.content";
             }
          }
-         part { name: "left_btn_separator";
-            type: IMAGE;
-            scale: 1;
-            clip_to: "title_clip";
-            description { state: "default" 0.0;
-               min: 2 48;
-               max: 2 48;
-               fixed: 1 1;
-               align: 1.0 0.5;
-               rel1 { relative: 0.0 0.0; to: "title_left_btn"; }
-               rel2 { relative: 0.0 1.0; to: "title_left_btn"; }
-               image.normal: "00_winset_title_line.png";
-               visible: 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "right_btn_separator";
-            type: IMAGE;
-            scale: 1;
-            clip_to: "title_clip";
-            description { state: "default" 0.0;
-               min: 2 48;
-               max: 2 48;
-               fixed: 1 1;
-               align: 1.0 0.5;
-               rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
-               rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
-               image.normal: "00_winset_title_line.png";
-               visible: 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "padding_before_text";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            clip_to: "title_clip";
-            description { state: "default" 0.0;
-               align: 0.0 0.0;
-               rel1 { relative: 0.0 0.0; to: "title_bg"; }
-               rel2 { relative: 0.0 1.0; to: "title_bg"; }
-               fixed: 1 0;
-               min: NAVIFRAME_ICON_PADDING_INC;
-               visible: 0;
-            }
-         }
          part { name: "padding_center_text1";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: 0 0;
+               min: NAVIFRAME_PADDING_INC;
                fixed: 1 0;
                align: 0.0 0.0;
-               rel1 { relative: 1.0 0.0; to: "padding_before_text"; }
-               rel2 { relative: 1.0 1.0; to: "padding_before_text"; }
+               rel1 { relative: 0.0 0.0; to: "title_bg"; }
+               rel2 { relative: 0.0 1.0; to: "title_bg"; }
                visible: 0;
             }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: 0 0;
-            }
             description { state: "icon" 0.0;
                inherit: "default" 0.0;
-               min: NAVIFRAME_NO_BUTTON_ICON_PADDING_INC 0;
-            }
-            description { state: "icon_left_button" 0.0;
-               inherit: "default" 0.0;
-               min: NAVIFRAME_TEXT_PADDING_ICON_VISIBLE_INC 0;
+               min: NAVIFRAME_ICON_PADDING_INC;
             }
          }
          part { name: "padding_center_text2";
@@ -282,17 +216,13 @@
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: 0 0;
+               min: NAVIFRAME_PADDING_INC;
                fixed: 1 0;
                align: 1.0 0.5;
-               rel1 { relative: 1.0 0.0; to: "title_bg"; }
-               rel2 { relative: 1.0 1.0; to: "title_bg"; }
+               rel1 { relative: 0.0 0.0; to_x: "title_more_btn"; to_y: "title_bg"; }
+               rel2 { relative: 0.0 1.0; to_x: "title_more_btn"; to_y: "title_bg"; }
                visible: 0;
             }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: NAVIFRAME_TEXT_PADDING_INC 0;
-            }
          }
          part { name: "elm.text.title";
             type: TEXT;
@@ -309,55 +239,22 @@
                color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
                align: 0.0 0.5;
                fixed: 1 0;
-               rel1 { relative: 1.0 0.0; to_x: "padding_center_text1"; to_y: "title_bg"; }
-               rel2 { relative: 0.0 1.0; to_x: "padding_center_text2"; to_y: "title_bg"; }
-            }
-            description { state: "right_and_more_button" 0.0;
-               inherit: "default" 0.0;
-               rel2 { relative: 0.0 1.0; to_x: "title_more_btn"; to_y: "title_bg"; }
-            }
-            description { state: "subtitle_is_set" 0.0;
-               inherit: "default" 0.0;
-               rel2 { relative: 0.0 0.7; to_x: "padding_center_text2"; to_y: "title_bg"; }
-            }
-            description { state: "subtitle_right_more_button_is_set" 0.0;
-               inherit: "default" 0.0;
-               rel2 { relative: 0.0 0.7; to_x: "title_more_btn"; to_y: "title_bg"; }
+               rel1 { relative: 1.0 0.0; to: "padding_center_text1"; }
+               rel2 { relative: 0.0 1.0; to: "padding_center_text2"; }
             }
          }
-         part { name: "elm.text.subtitle";
-            type: TEXT;
+         part { name: "padding_before_text";
+            type: RECT;
             scale: 1;
+            mouse_events: 0;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               text { font: "SLP:style=Medium";
-                  size: NAVIFRAME_SUBTITLE_FONT_SIZE_INC;
-                  min: 0 0;
-                  max: 1 0;
-                  align: 0.5 0.5;
-                  text_class: "slp_medium";
-               }
-               color: NAVIFRAME_SUBTITLE_TEXT_COLOR_INC;
-               align: 0.0 0.5;
+               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"; }
                fixed: 1 0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "padding_center_text1";
-                  to_y: "elm.text.title";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "padding_center_text2";
-                  to_y: "elm.text.title";
-               }
-            }
-            description { state: "right_and_more_button" 0.0;
-               inherit: "default" 0.0;
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "title_more_btn";
-                  to_y: "elm.text.title";
-               }
+               min: NAVIFRAME_PADDING_INC;
+               visible: 0;
             }
          }
          part { name: "elm.swallow.icon";
@@ -367,11 +264,11 @@
             description { state: "default" 0.0;
                max: NAVIFRAME_ICON_SIZE_INC;
                fixed: 1 1;
-               rel1 { relative: 0.0 0.0; to: "padding_center_text1"; }
-               rel2 { relative: 0.0 1.0; to: "padding_center_text1"; }
+               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: 0.0 0.5;
+               align: 1.0 0.5;
             }
          }
          part { name: "click_event_area";
@@ -394,6 +291,25 @@
                rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
             }
          }
+         part { name: "left_btn_separator";
+            type: IMAGE;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               min: 2 48;
+               max: 2 48;
+               fixed: 1 1;
+               align: 1.0 0.5;
+               rel1 { relative: 0.0 0.0; to: "title_left_btn"; }
+               rel2 { relative: 0.0 1.0; to: "title_left_btn"; }
+               image.normal: "00_winset_title_line.png";
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
          part { name: "title_right_btn";
             type: SWALLOW;
             scale: 1;
@@ -406,6 +322,25 @@
                rel2 { relative: 1.0 1.0; to: "title_bg"; }
             }
          }
+         part { name: "right_btn_separator";
+            type: IMAGE;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               min: 2 48;
+               max: 2 48;
+               fixed: 1 1;
+               align: 1.0 0.5;
+               rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
+               rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
+               image.normal: "00_winset_title_line.png";
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
          part { name: "title_more_btn";
             type: SWALLOW;
             scale: 1;
@@ -612,201 +547,41 @@
                set_state(PART:"elm.prev_btn_bg", "default", 0.0);
             }
          }
-         program { name: "subtitle_show";
-            signal: "elm,state,subtitle,show";
+         program { name: "icon_show";
+            signal: "elm,state,icon,show";
             source: "elm";
-            script {
-               set_int(subtitle_visible, 1);
-               if (get_int(large_padded_center_align) == 0)
-                 set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
-               else
-                 set_state(PART:"elm.text.title", "subtitle_is_set", 0.0);
-            }
+            action: STATE_SET "icon" 0.0;
+            target: "padding_center_text1";
          }
-         program { name: "subtitle_hide";
-            signal: "elm,state,subtitle,hide";
+         program { name: "icon_hide";
+            signal: "elm,state,icon,hide";
             source: "elm";
-            script {
-               set_int(subtitle_visible, 0);
-               if (get_int(large_padded_center_align) == 0)
-                 set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
-               else
-                 set_state(PART:"elm.text.title", "default", 0.0);
-            }
+            action: STATE_SET "default" 0.0;
+            target: "padding_center_text1";
          }
          program { name: "left_btn_show";
             signal: "elm,state,title_left_btn,show";
             source: "elm";
-            script {
-               set_int(left_btn_visible, 1);
-               set_state(PART:"left_btn_separator", "visible", 0.0);
-               if (get_int(icon_visible) == 1)
-                 set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
-               else
-                 set_state(PART:"padding_center_text1", "visible", 0.0);
-               if ((get_int(more_btn_visible) == 1) && (get_int(right_btn_visible) == 1)) {
-                  if (get_int(subtitle_visible) == 1)
-                    set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
-                  else
-                    set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
-                  set_state(PART:"elm.text.subtitle", "right_and_more_button", 0.0);
-                  set_int(large_padded_center_align, 0);
-               }
-               else {
-                  set_state(PART:"padding_center_text2", "visible", 0.0);
-                  set_int(large_padded_center_align, 1);
-               }
-            }
+            action: STATE_SET "visible" 0.0;
+            target: "left_btn_separator";
          }
          program { name: "left_btn_hide";
             signal: "elm,state,title_left_btn,hide";
             source: "elm";
-            script {
-               set_int(left_btn_visible, 0);
-               set_state(PART:"left_btn_separator", "default", 0.0);
-               if ((get_int(more_btn_visible) == 0) && (get_int(right_btn_visible) == 0)) {
-                  set_state(PART:"padding_center_text2", "default", 0.0);
-                  set_int(large_padded_center_align, 0);
-               }
-               else {
-                  set_state(PART:"padding_center_text2", "visible", 0.0);
-                  set_int(large_padded_center_align, 1);
-               }
-               if ((get_int(large_padded_center_align) == 1) && (get_int(icon_visible) == 1))
-                  set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
-               else if (get_int(large_padded_center_align) == 1)
-                  set_state(PART:"padding_center_text1", "visible", 0.0);
-               else if (get_int(icon_visible) == 1)
-                  set_state(PART:"padding_center_text1", "icon", 0.0);
-               else
-                  set_state(PART:"padding_center_text1", "default", 0.0);
-            }
+            action: STATE_SET "default" 0.0;
+            target: "left_btn_separator";
          }
          program { name: "right_btn_show";
             signal: "elm,state,title_right_btn,show";
             source: "elm";
-            script {
-               set_int(right_btn_visible, 1);
-               set_state(PART:"right_btn_separator", "visible", 0.0);
-               if (get_int(more_btn_visible) == 1) {
-                  if (get_int(subtitle_visible) == 1)
-                    set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
-                  else
-                    set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
-                  set_state(PART:"elm.text.subtitle", "right_and_more_button", 0.0);
-                  set_int(large_padded_center_align, 0);
-               }
-               else {
-                  set_state(PART:"padding_center_text2", "visible", 0.0);
-                  set_int(large_padded_center_align, 1);
-               }
-               if ((get_int(icon_visible) == 1) && ((get_int(left_btn_visible) == 1) ||
-                                                    (get_int(large_padded_center_align) == 1)))
-                 set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
-               else if ((get_int(left_btn_visible) == 1) || (get_int(large_padded_center_align) == 1))
-                 set_state(PART:"padding_center_text1", "visible", 0.0);
-               else if (get_int(icon_visible) == 1)
-                 set_state(PART:"padding_center_text1", "icon", 0.0);
-               else
-                 set_state(PART:"padding_center_text1", "default", 0.0);
-            }
+            action: STATE_SET "visible" 0.0;
+            target: "right_btn_separator";
          }
          program { name: "right_btn_hide";
             signal: "elm,state,title_right_btn,hide";
             source: "elm";
-            script {
-               set_int(right_btn_visible, 0);
-               set_state(PART:"right_btn_separator", "default", 0.0);
-               if ((get_int(more_btn_visible) == 0) && (get_int(left_btn_visible) == 0)) {
-                  set_state(PART:"padding_center_text2", "default", 0.0);
-                  set_int(large_padded_center_align, 0);
-               }
-               else {
-                  set_state(PART:"padding_center_text2", "visible", 0.0);
-                  set_int(large_padded_center_align, 1);
-               }
-               if ((get_int(large_padded_center_align) == 1) && (get_int(icon_visible) == 1))
-                  set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
-               else if (get_int(large_padded_center_align) == 1)
-                  set_state(PART:"padding_center_text1", "visible", 0.0);
-               else if (get_int(icon_visible) == 1)
-                  set_state(PART:"padding_center_text1", "icon", 0.0);
-               else
-                  set_state(PART:"padding_center_text1", "default", 0.0);
-            }
-         }
-         program { name: "more_btn_show";
-            signal: "elm,state,title_more_btn,show";
-            source: "elm";
-            script {
-               set_int(more_btn_visible, 1);
-               if (get_int(right_btn_visible) == 1) {
-                  if (get_int(subtitle_visible) == 1)
-                    set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
-                  else
-                    set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
-                  set_state(PART:"elm.text.subtitle", "right_and_more_button", 0.0);
-                  set_int(large_padded_center_align, 0);
-               }
-               else {
-                  set_state(PART:"padding_center_text2", "visible", 0.0);
-                  set_int(large_padded_center_align, 1);
-               }
-               if ((get_int(icon_visible) == 1) && ((get_int(left_btn_visible) == 1) ||
-                                                    (get_int(large_padded_center_align) == 1)))
-                 set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
-               else if ((get_int(left_btn_visible) == 1) || (get_int(large_padded_center_align) == 1))
-                 set_state(PART:"padding_center_text1", "visible", 0.0);
-               else if (get_int(icon_visible) == 1)
-                 set_state(PART:"padding_center_text1", "icon", 0.0);
-               else
-                 set_state(PART:"padding_center_text1", "default", 0.0);
-            }
-         }
-         program { name: "more_btn_hide";
-            signal: "elm,state,title_more_btn,hide";
-            source: "elm";
-            script {
-               set_int(more_btn_visible, 0);
-               if ((get_int(right_btn_visible) == 0) && (get_int(left_btn_visible) == 0)) {
-                  set_state(PART:"padding_center_text2", "default", 0.0);
-                  set_int(large_padded_center_align, 0);
-               }
-               else {
-                  set_state(PART:"padding_center_text2", "visible", 0.0);
-                  set_int(large_padded_center_align, 1);
-               }
-               if ((get_int(large_padded_center_align) == 1) && (get_int(icon_visible) == 1))
-                  set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
-               else if (get_int(large_padded_center_align) == 1)
-                  set_state(PART:"padding_center_text1", "visible", 0.0);
-               else if (get_int(icon_visible) == 1)
-                  set_state(PART:"padding_center_text1", "icon", 0.0);
-               else
-                  set_state(PART:"padding_center_text1", "default", 0.0);
-            }
-         }
-         program { name: "icon_show";
-            signal: "elm,state,icon,show";
-            source: "elm";
-            script {
-               set_int(icon_visible, 1);
-               if ((get_int(large_padded_center_align) == 1) || (get_int(left_btn_visible) == 1))
-                 set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
-               else
-                 set_state(PART:"padding_center_text1", "icon", 0.0);
-            }
-         }
-         program { name: "icon_hide";
-            signal: "elm,state,icon,hide";
-            source: "elm";
-            script {
-               set_int(icon_visible, 0);
-               if ((get_int(large_padded_center_align) == 1) || (get_int(left_btn_visible) == 1))
-                 set_state(PART:"padding_center_text1", "visible", 0.0);
-               else
-                 set_state(PART:"padding_center_text1", "default", 0.0);
-            }
+            action: STATE_SET "default" 0.0;
+            target: "right_btn_separator";
          }
          program { name: "controlbar_show";
             signal: "elm,state,controlbar,show";
@@ -965,12 +740,6 @@
          public oh_show = 0;     //optionheader show/hide
          public oh_close = 0;    //optionheader close/open
          public cbar_bg = 0;     //Controlbar BG Show call count
-         public left_btn_visible = 0; //whether left btn is shown
-         public icon_visible = 0; //whether icon is shown
-         public right_btn_visible = 0; //whether right btn is shown
-         public more_btn_visible = 0; //whether more btn is shown
-         public large_padded_center_align = 0; //large padding based on button size for center align for 1/2 buttons.
-         public subtitle_visible = 0; //whether subtitle is shown
       }
       parts {
          part { name: "base";
@@ -1075,7 +844,7 @@
                align: 0.0 0.0;
             }
          }
-         part { name: "optionheader.mid.padding";
+         part { name: "optionheader_mid_padding";
             type: RECT;
             scale: 1;
             clip_to: "optionheader_clip";
@@ -1094,13 +863,13 @@
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
                min: 0 NAVIFRAME_OH_CONTENT_H_INC;
-               rel1 { relative: 0.0 1.0; to: "optionheader.mid.padding";}
-               rel2 { relative: 1.0 1.0; to: "optionheader.mid.padding";}
+               rel1 { relative: 0.0 1.0; to: "optionheader_mid_padding";}
+               rel2 { relative: 1.0 1.0; to: "optionheader_mid_padding";}
                fixed: 0 1;
                align: 0.0 0.0;
             }
          }
-         part { name: "optionheader.bottom.padding";
+         part { name: "optionheader_bottom_padding";
             type: RECT;
             scale: 1;
             clip_to: "optionheader_clip";
@@ -1119,8 +888,8 @@
             clip_to: "optionheader_clip";
             description { state: "default" 0.0;
                min: 0 NAVIFRAME_OH_SHADOW_INC;
-               rel1 { relative: 0.0 1.0; to: "optionheader.bottom.padding"; }
-               rel2 { relative: 1.0 1.0; to: "optionheader.bottom.padding"; }
+               rel1 { relative: 0.0 1.0; to: "optionheader_bottom_padding"; }
+               rel2 { relative: 1.0 1.0; to: "optionheader_bottom_padding"; }
                fixed: 0 1;
                align: 0.0 0.0;
                visible: 0;
@@ -1149,82 +918,22 @@
                rel2.to: "elm.swallow.content";
             }
          }
-         part { name: "left_btn_separator";
-            type: IMAGE;
-            scale: 1;
-            clip_to: "title_clip";
-            description { state: "default" 0.0;
-               min: 2 48;
-               max: 2 48;
-               fixed: 1 1;
-               align: 1.0 0.5;
-               rel1 { relative: 0.0 0.0; to: "title_left_btn"; }
-               rel2 { relative: 0.0 1.0; to: "title_left_btn"; }
-               image.normal: "00_winset_title_line.png";
-               visible: 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "right_btn_separator";
-            type: IMAGE;
-            scale: 1;
-            clip_to: "title_clip";
-            description { state: "default" 0.0;
-               min: 2 48;
-               max: 2 48;
-               fixed: 1 1;
-               align: 1.0 0.5;
-               rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
-               rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
-               image.normal: "00_winset_title_line.png";
-               visible: 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "padding_before_text";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            clip_to: "title_clip";
-            description { state: "default" 0.0;
-               align: 0.0 0.0;
-               rel1 { relative: 0.0 0.0; to: "title_bg"; }
-               rel2 { relative: 0.0 1.0; to: "title_bg"; }
-               fixed: 1 0;
-               min: NAVIFRAME_ICON_PADDING_INC;
-               visible: 0;
-            }
-         }
          part { name: "padding_center_text1";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: 0 0;
+               min: NAVIFRAME_PADDING_INC;
                fixed: 1 0;
                align: 0.0 0.0;
-               rel1 { relative: 1.0 0.0; to: "padding_before_text"; }
-               rel2 { relative: 1.0 1.0; to: "padding_before_text"; }
+               rel1 { relative: 0.0 0.0; to: "title_bg"; }
+               rel2 { relative: 0.0 1.0; to: "title_bg"; }
                visible: 0;
             }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: 0 0;
-            }
             description { state: "icon" 0.0;
                inherit: "default" 0.0;
-               min: NAVIFRAME_NO_BUTTON_ICON_PADDING_INC 0;
-            }
-            description { state: "icon_left_button" 0.0;
-               inherit: "default" 0.0;
-               min: NAVIFRAME_TEXT_PADDING_ICON_VISIBLE_INC 0;
+               min: NAVIFRAME_ICON_PADDING_INC;
             }
          }
          part { name: "padding_center_text2";
@@ -1233,17 +942,13 @@
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               min: 0 0;
+               min: NAVIFRAME_PADDING_INC;
                fixed: 1 0;
                align: 1.0 0.5;
-               rel1 { relative: 1.0 0.0; to: "title_bg"; }
-               rel2 { relative: 1.0 1.0; to: "title_bg"; }
+               rel1 { relative: 0.0 0.0; to_x: "title_more_btn"; to_y: "title_bg"; }
+               rel2 { relative: 0.0 1.0; to_x: "title_more_btn"; to_y: "title_bg"; }
                visible: 0;
             }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: NAVIFRAME_TEXT_PADDING_INC 0;
-            }
          }
          part { name: "elm.text.title";
             type: TEXT;
@@ -1260,55 +965,22 @@
                color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
                align: 0.0 0.5;
                fixed: 1 0;
-               rel1 { relative: 1.0 0.0; to_x: "padding_center_text1"; to_y: "title_bg"; }
-               rel2 { relative: 0.0 1.0; to_x: "padding_center_text2"; to_y: "title_bg"; }
-            }
-            description { state: "right_and_more_button" 0.0;
-               inherit: "default" 0.0;
-               rel2 { relative: 0.0 1.0; to_x: "title_more_btn"; to_y: "title_bg"; }
-            }
-            description { state: "subtitle_is_set" 0.0;
-               inherit: "default" 0.0;
-               rel2 { relative: 0.0 0.7; to_x: "padding_center_text2"; to_y: "title_bg"; }
-            }
-            description { state: "subtitle_right_more_button_is_set" 0.0;
-               inherit: "default" 0.0;
-               rel2 { relative: 0.0 0.7; to_x: "title_more_btn"; to_y: "title_bg"; }
+               rel1 { relative: 1.0 0.0; to: "padding_center_text1"; }
+               rel2 { relative: 0.0 1.0; to: "padding_center_text2"; }
             }
          }
-         part { name: "elm.text.subtitle";
-            type: TEXT;
+         part { name: "padding_before_text";
+            type: RECT;
             scale: 1;
+            mouse_events: 0;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               text { font: "SLP:style=Medium";
-                  size: NAVIFRAME_SUBTITLE_FONT_SIZE_INC;
-                  min: 0 0;
-                  max: 1 0;
-                  align: 0.5 0.5;
-                  text_class: "slp_medium";
-               }
-               color: NAVIFRAME_SUBTITLE_TEXT_COLOR_INC;
-               align: 0.0 0.5;
+               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"; }
                fixed: 1 0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "padding_center_text1";
-                  to_y: "elm.text.title";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "padding_center_text2";
-                  to_y: "elm.text.title";
-               }
-            }
-            description { state: "right_and_more_button" 0.0;
-               inherit: "default" 0.0;
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "title_more_btn";
-                  to_y: "elm.text.title";
-               }
+               min: NAVIFRAME_PADDING_INC;
+               visible: 0;
             }
          }
          part { name: "elm.swallow.icon";
@@ -1318,11 +990,11 @@
             description { state: "default" 0.0;
                max: NAVIFRAME_ICON_SIZE_INC;
                fixed: 1 1;
-               rel1 { relative: 0.0 0.0; to: "padding_center_text1"; }
-               rel2 { relative: 0.0 1.0; to: "padding_center_text1"; }
+               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: 0.0 0.5;
+               align: 1.0 0.5;
             }
          }
          part { name: "click_event_area";
@@ -1345,6 +1017,25 @@
                rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
             }
          }
+         part { name: "left_btn_separator";
+            type: IMAGE;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               min: 2 48;
+               max: 2 48;
+               fixed: 1 1;
+               align: 1.0 0.5;
+               rel1 { relative: 0.0 0.0; to: "title_left_btn"; }
+               rel2 { relative: 0.0 1.0; to: "title_left_btn"; }
+               image.normal: "00_winset_title_line.png";
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
          part { name: "title_right_btn";
             type: SWALLOW;
             scale: 1;
@@ -1357,6 +1048,25 @@
                rel2 { relative: 1.0 1.0; to: "title_bg"; }
             }
          }
+         part { name: "right_btn_separator";
+            type: IMAGE;
+            scale: 1;
+            clip_to: "title_clip";
+            description { state: "default" 0.0;
+               min: 2 48;
+               max: 2 48;
+               fixed: 1 1;
+               align: 1.0 0.5;
+               rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
+               rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
+               image.normal: "00_winset_title_line.png";
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
          part { name: "title_more_btn";
             type: SWALLOW;
             scale: 1;
@@ -1563,201 +1273,41 @@
                set_state(PART:"elm.prev_btn_bg", "default", 0.0);
             }
          }
-         program { name: "subtitle_show";
-            signal: "elm,state,subtitle,show";
+         program { name: "icon_show";
+            signal: "elm,state,icon,show";
             source: "elm";
-            script {
-               set_int(subtitle_visible, 1);
-               if (get_int(large_padded_center_align) == 0)
-                 set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
-               else
-                 set_state(PART:"elm.text.title", "subtitle_is_set", 0.0);
-            }
+            action: STATE_SET "icon" 0.0;
+            target: "padding_center_text1";
          }
-         program { name: "subtitle_hide";
-            signal: "elm,state,subtitle,hide";
+         program { name: "icon_hide";
+            signal: "elm,state,icon,hide";
             source: "elm";
-            script {
-               set_int(subtitle_visible, 0);
-               if (get_int(large_padded_center_align) == 0)
-                 set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
-               else
-                 set_state(PART:"elm.text.title", "default", 0.0);
-            }
+            action: STATE_SET "default" 0.0;
+            target: "padding_center_text1";
          }
          program { name: "left_btn_show";
             signal: "elm,state,title_left_btn,show";
             source: "elm";
-            script {
-               set_int(left_btn_visible, 1);
-               set_state(PART:"left_btn_separator", "visible", 0.0);
-               if (get_int(icon_visible) == 1)
-                 set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
-               else
-                 set_state(PART:"padding_center_text1", "visible", 0.0);
-               if ((get_int(more_btn_visible) == 1) && (get_int(right_btn_visible) == 1)) {
-                  if (get_int(subtitle_visible) == 1)
-                    set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
-                  else
-                    set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
-                  set_state(PART:"elm.text.subtitle", "right_and_more_button", 0.0);
-                  set_int(large_padded_center_align, 0);
-               }
-               else {
-                  set_state(PART:"padding_center_text2", "visible", 0.0);
-                  set_int(large_padded_center_align, 1);
-               }
-            }
+            action: STATE_SET "visible" 0.0;
+            target: "left_btn_separator";
          }
          program { name: "left_btn_hide";
             signal: "elm,state,title_left_btn,hide";
             source: "elm";
-            script {
-               set_int(left_btn_visible, 0);
-               set_state(PART:"left_btn_separator", "default", 0.0);
-               if ((get_int(more_btn_visible) == 0) && (get_int(right_btn_visible) == 0)) {
-                  set_state(PART:"padding_center_text2", "default", 0.0);
-                  set_int(large_padded_center_align, 0);
-               }
-               else {
-                  set_state(PART:"padding_center_text2", "visible", 0.0);
-                  set_int(large_padded_center_align, 1);
-               }
-               if ((get_int(large_padded_center_align) == 1) && (get_int(icon_visible) == 1))
-                  set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
-               else if (get_int(large_padded_center_align) == 1)
-                  set_state(PART:"padding_center_text1", "visible", 0.0);
-               else if (get_int(icon_visible) == 1)
-                  set_state(PART:"padding_center_text1", "icon", 0.0);
-               else
-                  set_state(PART:"padding_center_text1", "default", 0.0);
-            }
+            action: STATE_SET "default" 0.0;
+            target: "left_btn_separator";
          }
          program { name: "right_btn_show";
             signal: "elm,state,title_right_btn,show";
             source: "elm";
-            script {
-               set_int(right_btn_visible, 1);
-               set_state(PART:"right_btn_separator", "visible", 0.0);
-               if (get_int(more_btn_visible) == 1) {
-                  if (get_int(subtitle_visible) == 1)
-                    set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
-                  else
-                    set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
-                  set_state(PART:"elm.text.subtitle", "right_and_more_button", 0.0);
-                  set_int(large_padded_center_align, 0);
-               }
-               else {
-                  set_state(PART:"padding_center_text2", "visible", 0.0);
-                  set_int(large_padded_center_align, 1);
-               }
-               if ((get_int(icon_visible) == 1) && ((get_int(left_btn_visible) == 1) ||
-                                                    (get_int(large_padded_center_align) == 1)))
-                 set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
-               else if ((get_int(left_btn_visible) == 1) || (get_int(large_padded_center_align) == 1))
-                 set_state(PART:"padding_center_text1", "visible", 0.0);
-               else if (get_int(icon_visible) == 1)
-                 set_state(PART:"padding_center_text1", "icon", 0.0);
-               else
-                 set_state(PART:"padding_center_text1", "default", 0.0);
-            }
+            action: STATE_SET "visible" 0.0;
+            target: "right_btn_separator";
          }
          program { name: "right_btn_hide";
             signal: "elm,state,title_right_btn,hide";
             source: "elm";
-            script {
-               set_int(right_btn_visible, 0);
-               set_state(PART:"right_btn_separator", "default", 0.0);
-               if ((get_int(more_btn_visible) == 0) && (get_int(left_btn_visible) == 0)) {
-                  set_state(PART:"padding_center_text2", "default", 0.0);
-                  set_int(large_padded_center_align, 0);
-               }
-               else {
-                  set_state(PART:"padding_center_text2", "visible", 0.0);
-                  set_int(large_padded_center_align, 1);
-               }
-               if ((get_int(large_padded_center_align) == 1) && (get_int(icon_visible) == 1))
-                  set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
-               else if (get_int(large_padded_center_align) == 1)
-                  set_state(PART:"padding_center_text1", "visible", 0.0);
-               else if (get_int(icon_visible) == 1)
-                  set_state(PART:"padding_center_text1", "icon", 0.0);
-               else
-                  set_state(PART:"padding_center_text1", "default", 0.0);
-            }
-         }
-         program { name: "more_btn_show";
-            signal: "elm,state,title_more_btn,show";
-            source: "elm";
-            script {
-               set_int(more_btn_visible, 1);
-               if (get_int(right_btn_visible) == 1) {
-                  if (get_int(subtitle_visible) == 1)
-                    set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
-                  else
-                    set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
-                  set_state(PART:"elm.text.subtitle", "right_and_more_button", 0.0);
-                  set_int(large_padded_center_align, 0);
-               }
-               else {
-                  set_state(PART:"padding_center_text2", "visible", 0.0);
-                  set_int(large_padded_center_align, 1);
-               }
-               if ((get_int(icon_visible) == 1) && ((get_int(left_btn_visible) == 1) ||
-                                                    (get_int(large_padded_center_align) == 1)))
-                 set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
-               else if ((get_int(left_btn_visible) == 1) || (get_int(large_padded_center_align) == 1))
-                 set_state(PART:"padding_center_text1", "visible", 0.0);
-               else if (get_int(icon_visible) == 1)
-                 set_state(PART:"padding_center_text1", "icon", 0.0);
-               else
-                 set_state(PART:"padding_center_text1", "default", 0.0);
-            }
-         }
-         program { name: "more_btn_hide";
-            signal: "elm,state,title_more_btn,hide";
-            source: "elm";
-            script {
-               set_int(more_btn_visible, 0);
-               if ((get_int(right_btn_visible) == 0) && (get_int(left_btn_visible) == 0)) {
-                  set_state(PART:"padding_center_text2", "default", 0.0);
-                  set_int(large_padded_center_align, 0);
-               }
-               else {
-                  set_state(PART:"padding_center_text2", "visible", 0.0);
-                  set_int(large_padded_center_align, 1);
-               }
-               if ((get_int(large_padded_center_align) == 1) && (get_int(icon_visible) == 1))
-                  set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
-               else if (get_int(large_padded_center_align) == 1)
-                  set_state(PART:"padding_center_text1", "visible", 0.0);
-               else if (get_int(icon_visible) == 1)
-                  set_state(PART:"padding_center_text1", "icon", 0.0);
-               else
-                  set_state(PART:"padding_center_text1", "default", 0.0);
-            }
-         }
-         program { name: "icon_show";
-            signal: "elm,state,icon,show";
-            source: "elm";
-            script {
-               set_int(icon_visible, 1);
-               if ((get_int(large_padded_center_align) == 1) || (get_int(left_btn_visible) == 1))
-                 set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
-               else
-                 set_state(PART:"padding_center_text1", "icon", 0.0);
-            }
-         }
-         program { name: "icon_hide";
-            signal: "elm,state,icon,hide";
-            source: "elm";
-            script {
-               set_int(icon_visible, 0);
-               if ((get_int(large_padded_center_align) == 1) || (get_int(left_btn_visible) == 1))
-                 set_state(PART:"padding_center_text1", "visible", 0.0);
-               else
-                 set_state(PART:"padding_center_text1", "default", 0.0);
-            }
+            action: STATE_SET "default" 0.0;
+            target: "right_btn_separator";
          }
          program { name: "controlbar_show";
             signal: "elm,state,controlbar,show";
@@ -1986,7 +1536,7 @@
                rel1 { relative: 0.0 0.0; }
                rel2 { relative: 0.0 1.0; }
                fixed: 1 0;
-               min: NAVIFRAME_ICON_PADDING_INC;
+               min: NAVIFRAME_PADDING_INC;
                visible: 0;
             }
          }
@@ -1999,7 +1549,7 @@
                rel1 { relative: 1.0 0.0; }
                rel2 { relative: 1.0 1.0; }
                fixed: 1 0;
-               min: NAVIFRAME_ICON_PADDING_INC;
+               min: NAVIFRAME_PADDING_INC;
                visible: 0;
             }
          }
@@ -2582,12 +2132,6 @@
          public oh_show = 0;     //optionheader show/hide
          public oh_close = 0;    //optionheader close/open
          public cbar_bg = 0;     //Controlbar BG Show call count
-         public left_btn_visible = 0; //whether left btn is shown
-         public icon_visible = 0; //whether icon is shown
-         public right_btn_visible = 0; //whether right btn is shown
-         public more_btn_visible = 0; //whether more btn is shown
-         public large_padded_center_align = 0; //large padding based on button size for center align for 1/2 buttons.
-         public subtitle_visible = 0; //whether subtitle is shown
       }
       programs {
          program { name: "cur_pushed";
@@ -2620,12 +2164,6 @@
          public oh_show = 0;     //optionheader show/hide
          public oh_close = 0;    //optionheader close/open
          public cbar_bg = 0;     //Controlbar BG Show call count
-         public left_btn_visible = 0; //whether left btn is shown
-         public icon_visible = 0; //whether icon is shown
-         public right_btn_visible = 0; //whether right btn is shown
-         public more_btn_visible = 0; //whether more btn is shown
-         public large_padded_center_align = 0; //large padding based on button size for center align for 1/2 buttons.
-         public subtitle_visible = 0; //whether subtitle is shown
       }
       programs {
          program { name: "cur_pushed";