[Naviframe]: GUI1.8 Implementation.

Change-Id: Ifad688ce1a07c4c99b27165e026b6d644b30dd4e

diff --git a/themes/widgets/naviframe.edc b/themes/widgets/naviframe.edc
index afbe838..439fcc9 100644 (file)
--- a/themes/widgets/naviframe.edc
+++ b/themes/widgets/naviframe.edc
@@ -190,6 +190,7 @@
             clip_to: "title_clip";
             description { state: "default" 0.0;
                min: 4 68;
+               max: 4 68;
                fixed: 1 1;
                align: 0.0 0.5;
                rel1 { relative: 1.0 0.0; to: "title_left_btn"; }
@@ -208,6 +209,7 @@
             clip_to: "title_clip";
             description { state: "default" 0.0;
                min: 4 68;
+               max: 4 68;
                fixed: 1 1;
                align: 1.0 0.5;
                rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
@@ -226,6 +228,7 @@
             clip_to: "title_clip";
             description { state: "default" 0.0;
                min: 4 68;
+               max: 4 68;
                fixed: 1 1;
                align: 1.0 0.5;
                rel1 { relative: 0.0 0.0; to: "title_more_btn"; }
@@ -428,7 +431,7 @@
                max: NAVIFRAME_OH_ARROW_SIZE_INC;
                fixed: 1 1;
                align: 0.5 0.0;
-               rel1 { relative: 0.0 1.025; to: "title_more_btn"; }
+               rel1 { relative: 0.0 0.9; to: "title_more_btn"; }
                rel2 { relative: 1.0 1.025; to: "title_more_btn"; }
                image.normal: "00_winset_control_top_arrow.png";
                color: 255 255 255 0;
@@ -1146,6 +1149,7 @@
             clip_to: "title_clip";
             description { state: "default" 0.0;
                min: 4 68;
+               max: 4 68;
                fixed: 1 1;
                align: 0.0 0.5;
                rel1 { relative: 1.0 0.0; to: "title_left_btn"; }
@@ -1384,7 +1388,7 @@
                max: NAVIFRAME_OH_ARROW_SIZE_INC;
                fixed: 1 1;
                align: 0.5 0.0;
-               rel1 { relative: 0.0 1.025; to: "title_more_btn"; }
+               rel1 { relative: 0.0 0.9; to: "title_more_btn"; }
                rel2 { relative: 1.0 1.025; to: "title_more_btn"; }
                image.normal: "00_winset_control_top_arrow.png";
                color: 255 255 255 0;
@@ -1987,42 +1991,6 @@
                rel2.to: "elm.swallow.content";
             }
          }
-         part { name: "left_btn_separator";
-            type: IMAGE;
-            scale: 1;
-            clip_to: "title_clip";
-            description { state: "default" 0.0;
-               min: 4 68;
-               fixed: 1 1;
-               align: 0.0 0.5;
-               rel1 { relative: 1.0 0.0; to: "title_left_btn"; }
-               rel2 { relative: 1.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: 4 68;
-               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_center_text";
             type: RECT;
             scale: 1;
@@ -2100,37 +2068,6 @@
                 rel2 { to: "title_bg"; }
              }
          }
-         part { name: "title_left_btn";
-            type: SWALLOW;
-            scale: 1;
-            clip_to: "title_clip";
-            description { state: "default" 0.0;
-               max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
-               fixed: 1 1;
-               align: 0 0;
-               rel1.relative: 0.0 1.0;
-               rel1.to_x: "title_bg";
-               rel1.to_y: "elm.text.title";
-               rel2.relative: 1.0 1.0;
-               rel2.to_x: "title_bg";
-               rel2.to_y: "elm.text.title";
-            }
-         }
-         part { name: "title_right_btn";
-            type: SWALLOW;
-            scale: 1;
-            clip_to: "title_clip";
-            description { state: "default" 0.0;
-               max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
-               align: 1 0.0;
-               fixed: 1 1;
-               rel1.relative: 1.0 1.0;
-               rel1.to_x: "title_bg";
-               rel1.to_y: "elm.text.title";
-               rel2.to_x: "title_bg";
-               rel2.to_y: "elm.text.title";
-            }
-         }
          part { name: "segment2";
             type: "SWALLOW";
             scale: 1;
@@ -2332,30 +2269,6 @@
             action: STATE_SET "hide" 0.0;
             target: "title_bg";
          }
-         program { name: "left_btn_show";
-            signal: "elm,state,title_left_btn,show";
-            source: "elm";
-            action: STATE_SET "visible" 0.0;
-            target: "left_btn_separator";
-         }
-         program { name: "left_btn_hide";
-            signal: "elm,state,title_left_btn,hide";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "left_btn_separator";
-         }
-         program { name: "right_btn_show";
-            signal: "elm,state,title_right_btn,show";
-            source: "elm";
-            action: STATE_SET "visible" 0.0;
-            target: "right_btn_separator";
-         }
-         program { name: "right_btn_hide";
-            signal: "elm,state,title_right_btn,hide";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "right_btn_separator";
-         }
          program { name: "icon_show";
             signal: "elm,state,icon,show";
             source: "elm";