Merge "[Naviframe]: [Guideline 1.1 implementation]"

diff --git a/themes/widgets/naviframe.edc b/themes/widgets/naviframe.edc
index dd1ee28..becf36a 100644 (file)
--- a/themes/widgets/naviframe.edc
+++ b/themes/widgets/naviframe.edc
@@ -406,6 +406,24 @@
                min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC 0;
             }
          }
+         part { name: "prev_btn_separator";
+            type: IMAGE;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 2 70;
+               max: 2 70;
+               fixed: 1 1;
+               align: 1.0 0.5;
+               rel1 { relative: 0.0 0.0; to: "elm.prev_btn_bg"; }
+               rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
+               image.normal: "00_winset_title_line.png";
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
          part { name: "elm.swallow.prev_btn";
             type: SWALLOW;
             scale: 1;
@@ -421,7 +439,7 @@
             mouse_events: 0;
             description { state: "default" 0.0;
                rel1.to: "controlbar_bg";
-               rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
+               rel2 { relative: 0.0 1.0; to_x: "prev_btn_separator"; to_y: "elm.prev_btn_bg"; }
             }
          }
          part { name: "controlbar";
@@ -535,6 +553,7 @@
             script {
                emit("elm,state,controlbar_bg,show", "elm");
                set_state(PART:"elm.prev_btn_bg", "visible", 0.0);
+               set_state(PART:"prev_btn_separator", "visible", 0.0);
             }
          }
          program { name: "prev_btn_hide";
@@ -543,6 +562,7 @@
             script {
                emit("elm,state,controlbar_bg,hide", "elm");
                set_state(PART:"elm.prev_btn_bg", "default", 0.0);
+               set_state(PART:"prev_btn_separator", "default", 0.0);
             }
          }
          program { name: "icon_show";
@@ -1130,6 +1150,24 @@
                min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC 0;
             }
          }
+         part { name: "prev_btn_separator";
+            type: IMAGE;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 2 70;
+               max: 2 70;
+               fixed: 1 1;
+               align: 1.0 0.5;
+               rel1 { relative: 0.0 0.0; to: "elm.prev_btn_bg"; }
+               rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
+               image.normal: "00_winset_title_line.png";
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
          part { name: "elm.swallow.prev_btn";
             type: SWALLOW;
             scale: 1;
@@ -1145,7 +1183,7 @@
             mouse_events: 0;
             description { state: "default" 0.0;
                rel1.to: "controlbar_bg";
-               rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
+               rel2 { relative: 0.0 1.0; to_x: "prev_btn_separator"; to_y: "elm.prev_btn_bg"; }
             }
          }
          part { name: "controlbar";
@@ -1259,6 +1297,7 @@
             script {
                emit("elm,state,controlbar_bg,show", "elm");
                set_state(PART:"elm.prev_btn_bg", "visible", 0.0);
+               set_state(PART:"prev_btn_separator", "visible", 0.0);
             }
          }
          program { name: "prev_btn_hide";
@@ -1267,6 +1306,7 @@
             script {
                emit("elm,state,controlbar_bg,hide", "elm");
                set_state(PART:"elm.prev_btn_bg", "default", 0.0);
+               set_state(PART:"prev_btn_separator", "default", 0.0);
             }
          }
          program { name: "icon_show";
@@ -1632,6 +1672,24 @@
                min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC 0;
             }
          }
+         part { name: "prev_btn_separator";
+            type: IMAGE;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 2 70;
+               max: 2 70;
+               fixed: 1 1;
+               align: 1.0 0.5;
+               rel1 { relative: 0.0 0.0; to: "elm.prev_btn_bg"; }
+               rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
+               image.normal: "00_winset_title_line.png";
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
         part { name: "elm.swallow.prev_btn";
            type: SWALLOW;
            scale: 1;
@@ -1647,7 +1705,7 @@
             mouse_events: 0;
             description { state: "default" 0.0;
                rel1.to: "controlbar_bg";
-               rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
+               rel2 { relative: 0.0 1.0; to_x: "prev_btn_separator"; to_y: "elm.prev_btn_bg"; }
             }
          }
          part { name: "controlbar";
@@ -1750,6 +1808,7 @@
             script {
                emit("elm,state,controlbar_bg,show", "elm");
                set_state(PART:"elm.prev_btn_bg", "visible", 0.0);
+               set_state(PART:"prev_btn_separator", "visible", 0.0);
             }
          }
          program { name: "prev_btn_hide";
@@ -1758,6 +1817,7 @@
             script {
                emit("elm,state,controlbar_bg,hide", "elm");
                set_state(PART:"elm.prev_btn_bg", "default", 0.0);
+               set_state(PART:"prev_btn_separator", "default", 0.0);
             }
          }
          program { name: "controlbar_show";
@@ -1921,6 +1981,24 @@
               min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC 0;
            }
          }
+         part { name: "prev_btn_separator";
+            type: IMAGE;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 2 70;
+               max: 2 70;
+               fixed: 1 1;
+               align: 1.0 0.5;
+               rel1 { relative: 0.0 0.0; to: "elm.prev_btn_bg"; }
+               rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
+               image.normal: "00_winset_title_line.png";
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
          part { name: "elm.swallow.prev_btn";
             type: SWALLOW;
             scale: 1;
@@ -1936,7 +2014,7 @@
             mouse_events: 0;
             description { state: "default" 0.0;
                rel1.to: "controlbar_bg";
-               rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
+               rel2 { relative: 0.0 1.0; to_x: "prev_btn_separator"; to_y: "elm.prev_btn_bg"; }
             }
          }
          part { name: "controlbar";
@@ -2027,6 +2105,7 @@
             script {
                emit("elm,state,controlbar_bg,show", "elm");
                set_state(PART:"elm.prev_btn_bg", "visible", 0.0);
+               set_state(PART:"prev_btn_separator", "visible", 0.0);
             }
          }
          program { name: "prev_btn_hide";
@@ -2035,6 +2114,7 @@
             script {
                emit("elm,state,controlbar_bg,hide", "elm");
                set_state(PART:"elm.prev_btn_bg", "default", 0.0);
+               set_state(PART:"prev_btn_separator", "default", 0.0);
             }
          }
          program { name: "controlbar_show";
@@ -2469,6 +2549,24 @@
                min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC 0;
             }
          }
+         part { name: "prev_btn_separator";
+            type: IMAGE;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 2 70;
+               max: 2 70;
+               fixed: 1 1;
+               align: 1.0 0.5;
+               rel1 { relative: 0.0 0.0; to: "elm.prev_btn_bg"; }
+               rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
+               image.normal: "00_winset_title_line.png";
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
          part { name: "elm.swallow.prev_btn";
             type: SWALLOW;
             scale: 1;
@@ -2484,7 +2582,7 @@
             mouse_events: 0;
             description { state: "default" 0.0;
                rel1.to: "controlbar_bg";
-               rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
+               rel2 { relative: 0.0 1.0; to_x: "prev_btn_separator"; to_y: "elm.prev_btn_bg"; }
             }
          }
          part { name: "controlbar";
@@ -2598,6 +2696,7 @@
             script {
                emit("elm,state,controlbar_bg,show", "elm");
                set_state(PART:"elm.prev_btn_bg", "visible", 0.0);
+               set_state(PART:"prev_btn_separator", "visible", 0.0);
             }
          }
          program { name: "prev_btn_hide";
@@ -2606,6 +2705,7 @@
             script {
                emit("elm,state,controlbar_bg,hide", "elm");
                set_state(PART:"elm.prev_btn_bg", "default", 0.0);
+               set_state(PART:"prev_btn_separator", "default", 0.0);
             }
          }
          program { name: "controlbar_show";