changelog - nbeat-theme_0.1.1-137

revert naviframe

diff --git a/debian/changelog b/debian/changelog
index 3862879..7f36573 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nbeat-theme (0.1.1-137) unstable; urgency=low
+
+  * Package Upload(revert naviframe)
+  * Git: slp-scm.sec.samsung.net:slp/pkgs/n/nbeat-theme
+  * Tag: nbeat-theme_0.1.1-137
+
+ -- ChunEon Park <chuneon.park@samsung.com>  Tue, 22 Nov 2011 14:25:41 +0900
+
 nbeat-theme (0.1.1-136) unstable; urgency=low
 
   * Package Upload

diff --git a/themes/groups/naviframe.edc b/themes/groups/naviframe.edc
index 46a07a5..b7186e0 100644 (file)
--- a/themes/groups/naviframe.edc
+++ b/themes/groups/naviframe.edc
@@ -151,7 +151,7 @@
                rel1.relative: 0.0 1.0;
                rel1.to_y: "optionheader_bg";
                rel2.relative: 1.0 0.0;
-               rel2.to_y: "controlbar_clip";
+               rel2.to_y: "controlbar_bg";
             }
            description { state: "left" 0.0;
                inherit: "default" 0.0;
@@ -376,7 +376,7 @@
                visible: 1;
             }
          }
-         part { name: "controlbar_clip";
+         part { name: "controlbar_bg";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
@@ -384,6 +384,7 @@
                max: 999999 0;
                fixed: 0 1;
                align: 0.5 1;
+               color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
                visible: 0;
                rel1.to_x: "elm.swallow.content";
                rel2.to_x: "elm.swallow.content";
@@ -395,19 +396,9 @@
                visible: 1;
             }
          }
-         part { name: "controlbar_bg";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 { to: "controlbar_clip"; }
-               rel2 { to: "controlbar_clip"; }
-               color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
-            }
-         }
          part { name: "elm.swallow.prev_btn";
             type: SWALLOW;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
                max: 0 CONTROLBAR_SMALL_HEIGHT_INC;
@@ -425,7 +416,6 @@
          part { name: "elm.swallow.controlbar";
             type: SWALLOW;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                rel1.to: "elm.swallow.prev_btn";
                rel1.relative: 1 0;
@@ -436,7 +426,6 @@
          part { name: "padding_after_controlbar";
             type: RECT;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
                max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
@@ -545,7 +534,7 @@
             signal: "elm,state,prev_btn,show";
             source: "elm";
             script {
-               emit("elm,state,controlbar_clip,show", "elm");
+               emit("elm,state,controlbar_bg,show", "elm");
                set_state(PART:"elm.swallow.prev_btn", "show", 0.0);
             }
          }
@@ -553,7 +542,7 @@
             signal: "elm,state,prev_btn,hide";
             source: "elm";
             script {
-               emit("elm,state,controlbar_clip,hide", "elm");
+               emit("elm,state,controlbar_bg,hide", "elm");
                set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
             }
          }
@@ -599,31 +588,31 @@
             signal: "elm,state,elm.swallow.controlbar,show";
             source: "elm";
             script {
-               emit("elm,state,controlbar_clip,show", "elm");
+               emit("elm,state,controlbar_bg,show", "elm");
             }
          }
          program { name: "controlbar_hide";
             signal: "elm,state,elm.swallow.controlbar,hide";
             source: "elm";
             script {
-               emit("elm,state,controlbar_clip,hide", "elm");
+               emit("elm,state,controlbar_bg,hide", "elm");
             }
          }
-         program { name: "controlbar_clip_show";
-            signal: "elm,state,controlbar_clip,show";
+         program { name: "controlbar_bg_show";
+            signal: "elm,state,controlbar_bg,show";
             source: "elm";
             script {
-               set_state(PART:"controlbar_clip", "show", 0.0);
+               set_state(PART:"controlbar_bg", "show", 0.0);
                set_int(cbar_bg, get_int(cbar_bg) + 1);
             }
          }
-         program { name: "controlbar_clip_hide";
-            signal: "elm,state,controlbar_clip,hide";
+         program { name: "controlbar_bg_hide";
+            signal: "elm,state,controlbar_bg,hide";
             source: "elm";
             script {
                set_int(cbar_bg, get_int(cbar_bg) - 1);
                if (get_int(cbar_bg) <= 0)
-                 set_state(PART:"controlbar_clip", "default", 0.0);
+                 set_state(PART:"controlbar_bg", "default", 0.0);
             }
          }
          program { name: "optionheader_show";
@@ -692,36 +681,6 @@
                set_int(oh_close, 0);
             }
          }
-         program { name: "controlbar_open";
-            signal: "elm,state,controlbar,open";
-            source: "";
-            action: STATE_SET "show" 0.0;
-            target: "controlbar_clip";
-            transition: LINEAR 0.2;
-         }
-         program { name: "controlbar_close";
-            signal: "elm,state,controlbar,close";
-            source: "";
-            action: STATE_SET "default" 0.0;
-            target: "controlbar_clip";
-            transition: LINEAR 0.2;
-         }
-         program { name: "controlbar_instant_open";
-            signal: "elm,state,controlbar,instant_open";
-            source: "";
-            script {
-               set_int(cbar_bg, 1);
-               emit("elm,state,controlbar_clip,show", "elm");
-            }
-         }
-         program { name: "controlbar_instant_close";
-            signal: "elm,state,controlbar,instant_close";
-            source: "";
-            script {
-               set_int(cbar_bg, 0);
-               emit("elm,state,controlbar_clip,hide", "elm");
-            }
-         }
          program { name: "show_finished";
             action: SIGNAL_EMIT "elm,action,show,finished" "";
          }
@@ -887,7 +846,7 @@
                rel1.relative: 0.0 1.0;
                rel1.to_y: "optionheader_bg";
                rel2.relative: 1.0 0.0;
-               rel2.to_y: "controlbar_clip";
+               rel2.to_y: "controlbar_bg";
             }
            description { state: "left" 0.0;
                inherit: "default" 0.0;
@@ -1112,7 +1071,7 @@
                 color: 255 255 255 255;
             }
          }
-         part { name: "controlbar_clip";
+         part { name: "controlbar_bg";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
@@ -1120,6 +1079,7 @@
                max: 999999 0;
                fixed: 0 1;
                align: 0.5 1;
+               color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
                visible: 0;
                rel1.to_x: "elm.swallow.content";
                rel2.to_x: "elm.swallow.content";
@@ -1131,19 +1091,9 @@
                visible: 1;
             }
          }
-         part { name: "controlbar_bg";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 { to: "controlbar_clip"; }
-               rel2 { to: "controlbar_clip"; }
-               color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
-            }
-         }
          part { name: "elm.swallow.prev_btn";
             type: SWALLOW;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
                max: 0 CONTROLBAR_SMALL_HEIGHT_INC;
@@ -1161,7 +1111,6 @@
          part { name: "elm.swallow.controlbar";
             type: SWALLOW;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                rel1.to: "elm.swallow.prev_btn";
                rel1.relative: 1 0;
@@ -1172,7 +1121,6 @@
          part { name: "padding_after_controlbar";
             type: RECT;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
                max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
@@ -1281,7 +1229,7 @@
             signal: "elm,state,prev_btn,show";
             source: "elm";
             script {
-               emit("elm,state,controlbar_clip,show", "elm");
+               emit("elm,state,controlbar_bg,show", "elm");
                set_state(PART:"elm.swallow.prev_btn", "show", 0.0);
             }
          }
@@ -1289,7 +1237,7 @@
             signal: "elm,state,prev_btn,hide";
             source: "elm";
             script {
-               emit("elm,state,controlbar_clip,hide", "elm");
+               emit("elm,state,controlbar_bg,hide", "elm");
                set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
             }
          }
@@ -1336,31 +1284,31 @@
             source: "elm";
             action: STATE_SET "show" 0.0;
             script {
-               emit("elm,state,controlbar_clip,show", "elm");
+               emit("elm,state,controlbar_bg,show", "elm");
             }
          }
          program { name: "controlbar_hide";
             signal: "elm,state,elm.swallow.controlbar,hide";
             source: "elm";
             script {
-               emit("elm,state,controlbar_clip,hide", "elm");
+               emit("elm,state,controlbar_bg,hide", "elm");
             }
          }
-         program { name: "controlbar_clip_show";
-            signal: "elm,state,controlbar_clip,show";
+         program { name: "controlbar_bg_show";
+            signal: "elm,state,controlbar_bg,show";
             source: "elm";
             script {
-               set_state(PART:"controlbar_clip", "show", 0.0);
+               set_state(PART:"controlbar_bg", "show", 0.0);
                set_int(cbar_bg, get_int(cbar_bg) + 1);
             }
          }
-         program { name: "controlbar_clip_hide";
-            signal: "elm,state,controlbar_clip,hide";
+         program { name: "controlbar_bg_hide";
+            signal: "elm,state,controlbar_bg,hide";
             source: "elm";
             script {
                set_int(cbar_bg, get_int(cbar_bg) - 1);
                if (get_int(cbar_bg) <= 0)
-                 set_state(PART:"controlbar_clip", "default", 0.0);
+                 set_state(PART:"controlbar_bg", "default", 0.0);
             }
          }
          program { name: "optionheader_show";
@@ -1429,36 +1377,6 @@
                set_int(oh_close, 0);
             }
          }
-         program { name: "controlbar_open";
-            signal: "elm,state,controlbar,open";
-            source: "";
-            action: STATE_SET "show" 0.0;
-            target: "controlbar_clip";
-            transition: LINEAR 0.2;
-         }
-         program { name: "controlbar_close";
-            signal: "elm,state,controlbar,close";
-            source: "";
-            action: STATE_SET "default" 0.0;
-            target: "controlbar_clip";
-            transition: LINEAR 0.2;
-         }
-         program { name: "controlbar_instant_open";
-            signal: "elm,state,controlbar,instant_open";
-            source: "";
-            script {
-               set_int(cbar_bg, 1);
-               emit("elm,state,controlbar_clip,show", "elm");
-            }
-         }
-         program { name: "controlbar_instant_close";
-            signal: "elm,state,controlbar,instant_close";
-            source: "";
-            script {
-               set_int(cbar_bg, 0);
-               emit("elm,state,controlbar_clip,hide", "elm");
-            }
-         }
          program { name: "show_finished";
             action: SIGNAL_EMIT "elm,action,show,finished" "";
          }
@@ -1517,7 +1435,7 @@
                rel1.relative: 0.0 1.0;
                rel1.to_y: "title_clip";
                rel2.relative: 1.0 0.0;
-               rel2.to_y: "controlbar_clip";
+               rel2.to_y: "controlbar_bg";
             }
            description { state: "left" 0.0;
                inherit: "default" 0.0;
@@ -1715,7 +1633,7 @@
                rel2.relative: 0.8 1;
             }
          }
-         part { name: "controlbar_clip";
+         part { name: "controlbar_bg";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
@@ -1723,6 +1641,7 @@
                max: 999999 0;
                fixed: 0 1;
                align: 0.5 1;
+               color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
                visible: 0;
                rel1.to_x: "elm.swallow.content";
                rel2.to_x: "elm.swallow.content";
@@ -1734,19 +1653,9 @@
                visible: 1;
             }
          }
-         part { name: "controlbar_bg";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 { to: "controlbar_clip"; }
-               rel2 { to: "controlbar_clip"; }
-               color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
-            }
-         }
          part { name: "elm.swallow.prev_btn";
             type: SWALLOW;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
                max: 0 CONTROLBAR_SMALL_HEIGHT_INC;
@@ -1764,7 +1673,6 @@
          part { name: "elm.swallow.controlbar";
             type: SWALLOW;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                rel1.to: "elm.swallow.prev_btn";
                rel1.relative: 1 0;
@@ -1775,7 +1683,6 @@
          part { name: "padding_after_controlbar";
             type: RECT;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
                max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
@@ -1873,7 +1780,7 @@
             signal: "elm,state,prev_btn,show";
             source: "elm";
             script {
-               emit("elm,state,controlbar_clip,show", "elm");
+               emit("elm,state,controlbar_bg,show", "elm");
                set_state(PART:"elm.swallow.prev_btn", "show", 0.0);
             }
          }
@@ -1881,7 +1788,7 @@
             signal: "elm,state,prev_btn,hide";
             source: "elm";
             script {
-               emit("elm,state,controlbar_clip,hide", "elm");
+               emit("elm,state,controlbar_bg,hide", "elm");
                set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
             }
          }
@@ -1914,61 +1821,31 @@
             source: "elm";
             action: STATE_SET "show" 0.0;
             script {
-               emit("elm,state,controlbar_clip,show", "elm");
+               emit("elm,state,controlbar_bg,show", "elm");
             }
          }
          program { name: "controlbar_hide";
             signal: "elm,state,elm.swallow.controlbar,hide";
             source: "elm";
             script {
-               emit("elm,state,controlbar_clip,hide", "elm");
+               emit("elm,state,controlbar_bg,hide", "elm");
             }
          }
-         program { name: "controlbar_clip_show";
-            signal: "elm,state,controlbar_clip,show";
+         program { name: "controlbar_bg_show";
+            signal: "elm,state,controlbar_bg,show";
             source: "elm";
             script {
-               set_state(PART:"controlbar_clip", "show", 0.0);
+               set_state(PART:"controlbar_bg", "show", 0.0);
                set_int(cbar_bg, get_int(cbar_bg) + 1);
             }
          }
-         program { name: "controlbar_clip_hide";
-            signal: "elm,state,controlbar_clip,hide";
+         program { name: "controlbar_bg_hide";
+            signal: "elm,state,controlbar_bg,hide";
             source: "elm";
             script {
                set_int(cbar_bg, get_int(cbar_bg) - 1);
                if (get_int(cbar_bg) <= 0)
-                 set_state(PART:"controlbar_clip", "default", 0.0);
-            }
-         }
-         program { name: "controlbar_open";
-            signal: "elm,state,controlbar,open";
-            source: "";
-            action: STATE_SET "show" 0.0;
-            target: "controlbar_clip";
-            transition: LINEAR 0.2;
-         }
-         program { name: "controlbar_close";
-            signal: "elm,state,controlbar,close";
-            source: "";
-            action: STATE_SET "default" 0.0;
-            target: "controlbar_clip";
-            transition: LINEAR 0.2;
-         }
-         program { name: "controlbar_instant_open";
-            signal: "elm,state,controlbar,instant_open";
-            source: "";
-            script {
-               set_int(cbar_bg, 1);
-               emit("elm,state,controlbar_clip,show", "elm");
-            }
-         }
-         program { name: "controlbar_instant_close";
-            signal: "elm,state,controlbar,instant_close";
-            source: "";
-            script {
-               set_int(cbar_bg, 0);
-               emit("elm,state,controlbar_clip,hide", "elm");
+                 set_state(PART:"controlbar_bg", "default", 0.0);
             }
          }
          program { name: "show_finished";
@@ -2000,7 +1877,7 @@
             description { state: "default" 0.0;
                align: 0.0 0.0;
                rel2.relative: 1.0 0.0;
-               rel2.to_y: "controlbar_clip";
+               rel2.to_y: "controlbar_bg";
             }
            description { state: "left" 0.0;
                inherit: "default" 0.0;
@@ -2013,7 +1890,7 @@
                rel2.relative: 2.0 0.0;
             }
          }
-         part { name: "controlbar_clip";
+         part { name: "controlbar_bg";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
@@ -2021,6 +1898,7 @@
                max: 999999 0;
                fixed: 0 1;
                align: 0.5 1;
+               color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
                visible: 0;
                rel1.to_x: "elm.swallow.content";
                rel2.to_x: "elm.swallow.content";
@@ -2032,19 +1910,9 @@
                visible: 1;
             }
          }
-         part { name: "controlbar_bg";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 { to: "controlbar_clip"; }
-               rel2 { to: "controlbar_clip"; }
-               color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
-            }
-         }
          part { name: "elm.swallow.prev_btn";
             type: SWALLOW;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
                max: 0 CONTROLBAR_SMALL_HEIGHT_INC;
@@ -2062,7 +1930,6 @@
          part { name: "elm.swallow.controlbar";
             type: SWALLOW;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                rel1.to: "elm.swallow.prev_btn";
                rel1.relative: 1 0;
@@ -2073,7 +1940,6 @@
          part { name: "padding_after_controlbar";
             type: RECT;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
                max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
@@ -2159,7 +2025,7 @@
             signal: "elm,state,prev_btn,show";
             source: "elm";
             script {
-               emit("elm,state,controlbar_clip,show", "elm");
+               emit("elm,state,controlbar_bg,show", "elm");
                set_state(PART:"elm.swallow.prev_btn", "show", 0.0);
             }
          }
@@ -2167,7 +2033,7 @@
             signal: "elm,state,prev_btn,hide";
             source: "elm";
             script {
-               emit("elm,state,controlbar_clip,hide", "elm");
+               emit("elm,state,controlbar_bg,hide", "elm");
                set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
             }
          }
@@ -2176,61 +2042,31 @@
             source: "elm";
             action: STATE_SET "show" 0.0;
             script {
-               emit("elm,state,controlbar_clip,show", "elm");
+               emit("elm,state,controlbar_bg,show", "elm");
             }
          }
          program { name: "controlbar_hide";
             signal: "elm,state,elm.swallow.controlbar,hide";
             source: "elm";
             script {
-               emit("elm,state,controlbar_clip,hide", "elm");
+               emit("elm,state,controlbar_bg,hide", "elm");
             }
          }
-         program { name: "controlbar_clip_show";
-            signal: "elm,state,controlbar_clip,show";
+         program { name: "controlbar_bg_show";
+            signal: "elm,state,controlbar_bg,show";
             source: "elm";
             script {
-               set_state(PART:"controlbar_clip", "show", 0.0);
+               set_state(PART:"controlbar_bg", "show", 0.0);
                set_int(cbar_bg, get_int(cbar_bg) + 1);
             }
          }
-         program { name: "controlbar_clip_hide";
-            signal: "elm,state,controlbar_clip,hide";
+         program { name: "controlbar_bg_hide";
+            signal: "elm,state,controlbar_bg,hide";
             source: "elm";
             script {
                set_int(cbar_bg, get_int(cbar_bg) - 1);
                if (get_int(cbar_bg) <= 0)
-                 set_state(PART:"controlbar_clip", "default", 0.0);
-            }
-         }
-         program { name: "controlbar_open";
-            signal: "elm,state,controlbar,open";
-            source: "";
-            action: STATE_SET "show" 0.0;
-            target: "controlbar_clip";
-            transition: LINEAR 0.2;
-         }
-         program { name: "controlbar_close";
-            signal: "elm,state,controlbar,close";
-            source: "";
-            action: STATE_SET "default" 0.0;
-            target: "controlbar_clip";
-            transition: LINEAR 0.2;
-         }
-         program { name: "controlbar_instant_open";
-            signal: "elm,state,controlbar,instant_open";
-            source: "";
-            script {
-               set_int(cbar_bg, 1);
-               emit("elm,state,controlbar_clip,show", "elm");
-            }
-         }
-         program { name: "controlbar_instant_close";
-            signal: "elm,state,controlbar,instant_close";
-            source: "";
-            script {
-               set_int(cbar_bg, 0);
-               emit("elm,state,controlbar_clip,hide", "elm");
+                 set_state(PART:"controlbar_bg", "default", 0.0);
             }
          }
          program { name: "show_finished";
@@ -2374,7 +2210,7 @@
                rel1.relative: 0.0 1.0;
                rel1.to_y: "optionheader_bg";
                rel2.relative: 1.0 0.0;
-               rel2.to_y: "controlbar_clip";
+               rel2.to_y: "controlbar_bg";
             }
          }
          part { name: "title_base";
@@ -2589,7 +2425,7 @@
                 color: 255 255 255 255;
             }
          }
-         part { name: "controlbar_clip";
+         part { name: "controlbar_bg";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
@@ -2597,6 +2433,7 @@
                max: 999999 0;
                fixed: 0 1;
                align: 0.5 1;
+               color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
                visible: 0;
                rel1.to_x: "elm.swallow.content";
                rel2.to_x: "elm.swallow.content";
@@ -2608,19 +2445,9 @@
                visible: 1;
             }
          }
-         part { name: "controlbar_bg";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 { to: "controlbar_clip"; }
-               rel2 { to: "controlbar_clip"; }
-               color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
-            }
-         }
          part { name: "elm.swallow.prev_btn";
             type: SWALLOW;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
                max: 0 CONTROLBAR_SMALL_HEIGHT_INC;
@@ -2638,7 +2465,6 @@
          part { name: "elm.swallow.controlbar";
             type: SWALLOW;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                rel1.to: "elm.swallow.prev_btn";
                rel1.relative: 1 0;
@@ -2649,7 +2475,6 @@
          part { name: "padding_after_controlbar";
             type: RECT;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
                max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
@@ -2708,7 +2533,7 @@
             signal: "elm,state,prev_btn,show";
             source: "elm";
             script {
-               emit("elm,state,controlbar_clip,show", "elm");
+               emit("elm,state,controlbar_bg,show", "elm");
                set_state(PART:"elm.swallow.prev_btn", "show", 0.0);
             }
          }
@@ -2716,7 +2541,7 @@
             signal: "elm,state,prev_btn,hide";
             source: "elm";
             script {
-               emit("elm,state,controlbar_clip,hide", "elm");
+               emit("elm,state,controlbar_bg,hide", "elm");
                set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
             }
          }
@@ -2763,31 +2588,31 @@
             source: "elm";
             action: STATE_SET "show" 0.0;
             script {
-               emit("elm,state,controlbar_clip,show", "elm");
+               emit("elm,state,controlbar_bg,show", "elm");
             }
          }
          program { name: "controlbar_hide";
             signal: "elm,state,elm.swallow.controlbar,hide";
             source: "elm";
             script {
-               emit("elm,state,controlbar_clip,hide", "elm");
+               emit("elm,state,controlbar_bg,hide", "elm");
             }
          }
-         program { name: "controlbar_clip_show";
-            signal: "elm,state,controlbar_clip,show";
+         program { name: "controlbar_bg_show";
+            signal: "elm,state,controlbar_bg,show";
             source: "elm";
             script {
-               set_state(PART:"controlbar_clip", "show", 0.0);
+               set_state(PART:"controlbar_bg", "show", 0.0);
                set_int(cbar_bg, get_int(cbar_bg) + 1);
             }
          }
-         program { name: "controlbar_clip_hide";
-            signal: "elm,state,controlbar_clip,hide";
+         program { name: "controlbar_bg_hide";
+            signal: "elm,state,controlbar_bg,hide";
             source: "elm";
             script {
                set_int(cbar_bg, get_int(cbar_bg) - 1);
                if (get_int(cbar_bg) <= 0)
-                 set_state(PART:"controlbar_clip", "default", 0.0);
+                 set_state(PART:"controlbar_bg", "default", 0.0);
             }
          }
          program { name: "optionheader_show";
@@ -2856,36 +2681,6 @@
                set_int(oh_close, 0);
             }
          }
-         program { name: "controlbar_open";
-            signal: "elm,state,controlbar,open";
-            source: "";
-            action: STATE_SET "show" 0.0;
-            target: "controlbar_clip";
-            transition: LINEAR 0.2;
-         }
-         program { name: "controlbar_close";
-            signal: "elm,state,controlbar,close";
-            source: "";
-            action: STATE_SET "default" 0.0;
-            target: "controlbar_clip";
-            transition: LINEAR 0.2;
-         }
-         program { name: "controlbar_instant_open";
-            signal: "elm,state,controlbar,instant_open";
-            source: "";
-            script {
-               set_int(cbar_bg, 1);
-               emit("elm,state,controlbar_clip,show", "elm");
-            }
-         }
-         program { name: "controlbar_instant_close";
-            signal: "elm,state,controlbar,instant_close";
-            source: "";
-            script {
-               set_int(cbar_bg, 0);
-               emit("elm,state,controlbar_clip,hide", "elm");
-            }
-         }
          program { name: "show_finished";
             action: SIGNAL_EMIT "elm,action,show,finished" "";
          }
@@ -3052,7 +2847,7 @@
                rel1.relative: 0.0 1.0;
                rel1.to_y: "optionheader_bg";
                rel2.relative: 1.0 0.0;
-               rel2.to_y: "controlbar_clip";
+               rel2.to_y: "controlbar_bg";
             }
          }
          part { name: "title_base";
@@ -3267,7 +3062,7 @@
                 color: 255 255 255 255;
             }
          }
-         part { name: "controlbar_clip";
+         part { name: "controlbar_bg";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
@@ -3275,6 +3070,7 @@
                max: 999999 0;
                fixed: 0 1;
                align: 0.5 1;
+               color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
                visible: 0;
                rel1.to_x: "elm.swallow.content";
                rel2.to_x: "elm.swallow.content";
@@ -3286,19 +3082,9 @@
                visible: 1;
             }
          }
-         part { name: "controlbar_bg";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 { to: "controlbar_clip"; }
-               rel2 { to: "controlbar_clip"; }
-               color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
-            }
-         }
          part { name: "elm.swallow.prev_btn";
             type: SWALLOW;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
                max: 0 CONTROLBAR_SMALL_HEIGHT_INC;
@@ -3316,7 +3102,6 @@
          part { name: "elm.swallow.controlbar";
             type: SWALLOW;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                rel1.to: "elm.swallow.prev_btn";
                rel1.relative: 1 0;
@@ -3327,7 +3112,6 @@
          part { name: "padding_after_controlbar";
             type: RECT;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
                max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
@@ -3386,7 +3170,7 @@
             signal: "elm,state,prev_btn,show";
             source: "elm";
             script {
-               emit("elm,state,controlbar_clip,show", "elm");
+               emit("elm,state,controlbar_bg,show", "elm");
                set_state(PART:"elm.swallow.prev_btn", "show", 0.0);
             }
          }
@@ -3394,7 +3178,7 @@
             signal: "elm,state,prev_btn,hide";
             source: "elm";
             script {
-               emit("elm,state,controlbar_clip,hide", "elm");
+               emit("elm,state,controlbar_bg,hide", "elm");
                set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
             }
          }
@@ -3441,31 +3225,31 @@
             source: "elm";
             action: STATE_SET "show" 0.0;
             script {
-               emit("elm,state,controlbar_clip,show", "elm");
+               emit("elm,state,controlbar_bg,show", "elm");
             }
          }
          program { name: "controlbar_hide";
             signal: "elm,state,elm.swallow.controlbar,hide";
             source: "elm";
             script {
-               emit("elm,state,controlbar_clip,hide", "elm");
+               emit("elm,state,controlbar_bg,hide", "elm");
             }
          }
-         program { name: "controlbar_clip_show";
-            signal: "elm,state,controlbar_clip,show";
+         program { name: "controlbar_bg_show";
+            signal: "elm,state,controlbar_bg,show";
             source: "elm";
             script {
-               set_state(PART:"controlbar_clip", "show", 0.0);
+               set_state(PART:"controlbar_bg", "show", 0.0);
                set_int(cbar_bg, get_int(cbar_bg) + 1);
             }
          }
-         program { name: "controlbar_clip_hide";
-            signal: "elm,state,controlbar_clip,hide";
+         program { name: "controlbar_bg_hide";
+            signal: "elm,state,controlbar_bg,hide";
             source: "elm";
             script {
                set_int(cbar_bg, get_int(cbar_bg) - 1);
                if (get_int(cbar_bg) <= 0)
-                 set_state(PART:"controlbar_clip", "default", 0.0);
+                 set_state(PART:"controlbar_bg", "default", 0.0);
             }
          }
          program { name: "optionheader_show";
@@ -3534,36 +3318,6 @@
                set_int(oh_close, 0);
             }
          }
-         program { name: "controlbar_open";
-            signal: "elm,state,controlbar,open";
-            source: "";
-            action: STATE_SET "show" 0.0;
-            target: "controlbar_clip";
-            transition: LINEAR 0.2;
-         }
-         program { name: "controlbar_close";
-            signal: "elm,state,controlbar,close";
-            source: "";
-            action: STATE_SET "default" 0.0;
-            target: "controlbar_clip";
-            transition: LINEAR 0.2;
-         }
-         program { name: "controlbar_instant_open";
-            signal: "elm,state,controlbar,instant_open";
-            source: "";
-            script {
-               set_int(cbar_bg, 1);
-               emit("elm,state,controlbar_clip,show", "elm");
-            }
-         }
-         program { name: "controlbar_instant_close";
-            signal: "elm,state,controlbar,instant_close";
-            source: "";
-            script {
-               set_int(cbar_bg, 0);
-               emit("elm,state,controlbar_clip,hide", "elm");
-            }
-         }
          program { name: "show_finished";
             action: SIGNAL_EMIT "elm,action,show,finished" "";
          }
@@ -3622,7 +3376,7 @@
                rel1.relative: 0.0 1.0;
                rel1.to_y: "title_clip";
                rel2.relative: 1.0 0.0;
-               rel2.to_y: "controlbar_clip";
+               rel2.to_y: "controlbar_bg";
             }
         }
          part { name: "title_base";
@@ -3810,7 +3564,7 @@
                rel2.relative: 0.8 1;
             }
          }
-         part { name: "controlbar_clip";
+         part { name: "controlbar_bg";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
@@ -3818,6 +3572,7 @@
                max: 999999 0;
                fixed: 0 1;
                align: 0.5 1;
+               color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
                visible: 0;
                rel1.to_x: "elm.swallow.content";
                rel2.to_x: "elm.swallow.content";
@@ -3829,19 +3584,9 @@
                visible: 1;
             }
          }
-         part { name: "controlbar_bg";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 { to: "controlbar_clip"; }
-               rel2 { to: "controlbar_clip"; }
-               color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
-            }
-         }
          part { name: "elm.swallow.prev_btn";
             type: SWALLOW;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
                max: 0 CONTROLBAR_SMALL_HEIGHT_INC;
@@ -3859,7 +3604,6 @@
          part { name: "elm.swallow.controlbar";
             type: SWALLOW;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                rel1.to: "elm.swallow.prev_btn";
                rel1.relative: 1 0;
@@ -3870,7 +3614,6 @@
          part { name: "padding_after_controlbar";
             type: RECT;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
                max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
@@ -3918,7 +3661,7 @@
             signal: "elm,state,prev_btn,show";
             source: "elm";
             script {
-               emit("elm,state,controlbar_clip,show", "elm");
+               emit("elm,state,controlbar_bg,show", "elm");
                set_state(PART:"elm.swallow.prev_btn", "show", 0.0);
             }
          }
@@ -3926,7 +3669,7 @@
             signal: "elm,state,prev_btn,hide";
             source: "elm";
             script {
-               emit("elm,state,controlbar_clip,hide", "elm");
+               emit("elm,state,controlbar_bg,hide", "elm");
                set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
             }
          }
@@ -3959,61 +3702,31 @@
             source: "elm";
             action: STATE_SET "show" 0.0;
             script {
-               emit("elm,state,controlbar_clip,show", "elm");
+               emit("elm,state,controlbar_bg,show", "elm");
             }
          }
          program { name: "controlbar_hide";
             signal: "elm,state,elm.swallow.controlbar,hide";
             source: "elm";
             script {
-               emit("elm,state,controlbar_clip,hide", "elm");
+               emit("elm,state,controlbar_bg,hide", "elm");
             }
          }
-         program { name: "controlbar_clip_show";
-            signal: "elm,state,controlbar_clip,show";
+         program { name: "controlbar_bg_show";
+            signal: "elm,state,controlbar_bg,show";
             source: "elm";
             script {
-               set_state(PART:"controlbar_clip", "show", 0.0);
+               set_state(PART:"controlbar_bg", "show", 0.0);
                set_int(cbar_bg, get_int(cbar_bg) + 1);
             }
          }
-         program { name: "controlbar_clip_hide";
-            signal: "elm,state,controlbar_clip,hide";
+         program { name: "controlbar_bg_hide";
+            signal: "elm,state,controlbar_bg,hide";
             source: "elm";
             script {
                set_int(cbar_bg, get_int(cbar_bg) - 1);
                if (get_int(cbar_bg) <= 0)
-                 set_state(PART:"controlbar_clip", "default", 0.0);
-            }
-         }
-         program { name: "controlbar_open";
-            signal: "elm,state,controlbar,open";
-            source: "";
-            action: STATE_SET "show" 0.0;
-            target: "controlbar_clip";
-            transition: LINEAR 0.2;
-         }
-         program { name: "controlbar_close";
-            signal: "elm,state,controlbar,close";
-            source: "";
-            action: STATE_SET "default" 0.0;
-            target: "controlbar_clip";
-            transition: LINEAR 0.2;
-         }
-         program { name: "controlbar_instant_open";
-            signal: "elm,state,controlbar,instant_open";
-            source: "";
-            script {
-               set_int(cbar_bg, 1);
-               emit("elm,state,controlbar_clip,show", "elm");
-            }
-         }
-         program { name: "controlbar_instant_close";
-            signal: "elm,state,controlbar,instant_close";
-            source: "";
-            script {
-               set_int(cbar_bg, 0);
-               emit("elm,state,controlbar_clip,hide", "elm");
+                 set_state(PART:"controlbar_bg", "default", 0.0);
             }
          }
          program { name: "show_finished";
@@ -4045,10 +3758,10 @@
             description { state: "default" 0.0;
                align: 0.0 0.0;
                rel2.relative: 1.0 0.0;
-               rel2.to_y: "controlbar_clip";
+               rel2.to_y: "controlbar_bg";
             }
          }
-         part { name: "controlbar_clip";
+         part { name: "controlbar_bg";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
@@ -4056,6 +3769,7 @@
                max: 999999 0;
                fixed: 0 1;
                align: 0.5 1;
+               color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
                visible: 0;
                rel1.to_x: "elm.swallow.content";
                rel2.to_x: "elm.swallow.content";
@@ -4067,19 +3781,9 @@
                visible: 1;
             }
          }
-         part { name: "controlbar_bg";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 { to: "controlbar_clip"; }
-               rel2 { to: "controlbar_clip"; }
-               color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
-            }
-         }
          part { name: "elm.swallow.prev_btn";
             type: SWALLOW;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
                max: 0 CONTROLBAR_SMALL_HEIGHT_INC;
@@ -4097,7 +3801,6 @@
          part { name: "elm.swallow.controlbar";
             type: SWALLOW;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                rel1.to: "elm.swallow.prev_btn";
                rel1.relative: 1 0;
@@ -4108,7 +3811,6 @@
          part { name: "padding_after_controlbar";
             type: RECT;
             scale: 1;
-            clip_to: "controlbar_clip";
             description { state: "default" 0.0;
                min: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
                max: NAVIFRAME_CONTROLBAR_PADDING_INC CONTROLBAR_SMALL_HEIGHT_INC;
@@ -4144,7 +3846,7 @@
             signal: "elm,state,prev_btn,show";
             source: "elm";
             script {
-               emit("elm,state,controlbar_clip,show", "elm");
+               emit("elm,state,controlbar_bg,show", "elm");
                set_state(PART:"elm.swallow.prev_btn", "show", 0.0);
             }
          }
@@ -4152,7 +3854,7 @@
             signal: "elm,state,prev_btn,hide";
             source: "elm";
             script {
-               emit("elm,state,controlbar_clip,hide", "elm");
+               emit("elm,state,controlbar_bg,hide", "elm");
                set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
             }
          }
@@ -4161,61 +3863,31 @@
             source: "elm";
             action: STATE_SET "show" 0.0;
             script {
-               emit("elm,state,controlbar_clip,show", "elm");
+               emit("elm,state,controlbar_bg,show", "elm");
             }
          }
          program { name: "controlbar_hide";
             signal: "elm,state,elm.swallow.controlbar,hide";
             source: "elm";
             script {
-               emit("elm,state,controlbar_clip,hide", "elm");
+               emit("elm,state,controlbar_bg,hide", "elm");
             }
          }
-         program { name: "controlbar_clip_show";
-            signal: "elm,state,controlbar_clip,show";
+         program { name: "controlbar_bg_show";
+            signal: "elm,state,controlbar_bg,show";
             source: "elm";
             script {
-               set_state(PART:"controlbar_clip", "show", 0.0);
+               set_state(PART:"controlbar_bg", "show", 0.0);
                set_int(cbar_bg, get_int(cbar_bg) + 1);
             }
          }
-         program { name: "controlbar_clip_hide";
-            signal: "elm,state,controlbar_clip,hide";
+         program { name: "controlbar_bg_hide";
+            signal: "elm,state,controlbar_bg,hide";
             source: "elm";
             script {
                set_int(cbar_bg, get_int(cbar_bg) - 1);
                if (get_int(cbar_bg) <= 0)
-                 set_state(PART:"controlbar_clip", "default", 0.0);
-            }
-         }
-         program { name: "controlbar_open";
-            signal: "elm,state,controlbar,open";
-            source: "";
-            action: STATE_SET "show" 0.0;
-            target: "controlbar_clip";
-            transition: LINEAR 0.2;
-         }
-         program { name: "controlbar_close";
-            signal: "elm,state,controlbar,close";
-            source: "";
-            action: STATE_SET "default" 0.0;
-            target: "controlbar_clip";
-            transition: LINEAR 0.2;
-         }
-         program { name: "controlbar_instant_open";
-            signal: "elm,state,controlbar,instant_open";
-            source: "";
-            script {
-               set_int(cbar_bg, 1);
-               emit("elm,state,controlbar_clip,show", "elm");
-            }
-         }
-         program { name: "controlbar_instant_close";
-            signal: "elm,state,controlbar,instant_close";
-            source: "";
-            script {
-               set_int(cbar_bg, 0);
-               emit("elm,state,controlbar_clip,hide", "elm");
+                 set_state(PART:"controlbar_bg", "default", 0.0);
             }
          }
          program { name: "show_finished";