projects / profile / ivi / efl-theme-tizen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 320e782)
[elc_naviframe]: Bug fix: when prev button is set and then unset, the
authorShilpa Singh <shilpa.singh@samsung.com>
Tue, 15 Nov 2011 12:47:08 +0000 (18:17 +0530)
committerShilpa Singh <shilpa.singh@samsung.com>
Tue, 15 Nov 2011 12:47:08 +0000 (18:17 +0530)
control bar background is still visible.

Change-Id: I0f745bca5d0661fe222b4884798d978fc870c6b7

themes/groups/naviframe.edc patch | blob | history

diff --git a/themes/groups/naviframe.edc b/themes/groups/naviframe.edc
index 60eb5b4..b7186e0 100644 (file)
--- a/themes/groups/naviframe.edc
+++ b/themes/groups/naviframe.edc
@@ -533,7 +533,6 @@
          program { name: "prev_btn_show";
             signal: "elm,state,prev_btn,show";
             source: "elm";
-            action: STATE_SET "show" 0.0;
             script {
                emit("elm,state,controlbar_bg,show", "elm");
                set_state(PART:"elm.swallow.prev_btn", "show", 0.0);
@@ -542,9 +541,8 @@
          program { name: "prev_btn_hide";
             signal: "elm,state,prev_btn,hide";
             source: "elm";
-            action: STATE_SET "default" 0.0;
             script {
-               emit("elm,state,controlbar_bg,show", "elm");
+               emit("elm,state,controlbar_bg,hide", "elm");
                set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
             }
          }
@@ -605,19 +603,16 @@
             source: "elm";
             script {
                set_state(PART:"controlbar_bg", "show", 0.0);
-               ++cbar_bg;
+               set_int(cbar_bg, get_int(cbar_bg) + 1);
             }
          }
          program { name: "controlbar_bg_hide";
             signal: "elm,state,controlbar_bg,hide";
             source: "elm";
             script {
-               --cbar_bg;
-               if (cbar_bg < 1)
-                 {
-                    cbar_bg = 0;
-                    set_state(PART:"controlbar_bg", "default", 0.0);
-                 }
+               set_int(cbar_bg, get_int(cbar_bg) - 1);
+               if (get_int(cbar_bg) <= 0)
+                 set_state(PART:"controlbar_bg", "default", 0.0);
             }
          }
          program { name: "optionheader_show";
@@ -1233,7 +1228,6 @@
          program { name: "prev_btn_show";
             signal: "elm,state,prev_btn,show";
             source: "elm";
-            action: STATE_SET "show" 0.0;
             script {
                emit("elm,state,controlbar_bg,show", "elm");
                set_state(PART:"elm.swallow.prev_btn", "show", 0.0);
@@ -1242,9 +1236,8 @@
          program { name: "prev_btn_hide";
             signal: "elm,state,prev_btn,hide";
             source: "elm";
-            action: STATE_SET "default" 0.0;
             script {
-               emit("elm,state,controlbar_bg,show", "elm");
+               emit("elm,state,controlbar_bg,hide", "elm");
                set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
             }
          }
@@ -1306,19 +1299,16 @@
             source: "elm";
             script {
                set_state(PART:"controlbar_bg", "show", 0.0);
-               ++cbar_bg;
+               set_int(cbar_bg, get_int(cbar_bg) + 1);
             }
          }
          program { name: "controlbar_bg_hide";
             signal: "elm,state,controlbar_bg,hide";
             source: "elm";
             script {
-               --cbar_bg;
-               if (cbar_bg < 1)
-                 {
-                    set_state(PART:"controlbar_bg", "default", 0.0);
-                    cbar_bg = 0;
-                 }
+               set_int(cbar_bg, get_int(cbar_bg) - 1);
+               if (get_int(cbar_bg) <= 0)
+                 set_state(PART:"controlbar_bg", "default", 0.0);
             }
          }
          program { name: "optionheader_show";
@@ -1789,7 +1779,6 @@
          program { name: "prev_btn_show";
             signal: "elm,state,prev_btn,show";
             source: "elm";
-            action: STATE_SET "show" 0.0;
             script {
                emit("elm,state,controlbar_bg,show", "elm");
                set_state(PART:"elm.swallow.prev_btn", "show", 0.0);
@@ -1798,9 +1787,8 @@
          program { name: "prev_btn_hide";
             signal: "elm,state,prev_btn,hide";
             source: "elm";
-            action: STATE_SET "default" 0.0;
             script {
-               emit("elm,state,controlbar_bg,show", "elm");
+               emit("elm,state,controlbar_bg,hide", "elm");
                set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
             }
          }
@@ -1848,19 +1836,16 @@
             source: "elm";
             script {
                set_state(PART:"controlbar_bg", "show", 0.0);
-               ++cbar_bg;
+               set_int(cbar_bg, get_int(cbar_bg) + 1);
             }
          }
          program { name: "controlbar_bg_hide";
             signal: "elm,state,controlbar_bg,hide";
             source: "elm";
             script {
-               --cbar_bg;
-               if (cbar_bg < 1)
-                 {
-                    set_state(PART:"controlbar_bg", "default", 0.0);
-                    cbar_bg = 0;
-                 }
+               set_int(cbar_bg, get_int(cbar_bg) - 1);
+               if (get_int(cbar_bg) <= 0)
+                 set_state(PART:"controlbar_bg", "default", 0.0);
             }
          }
          program { name: "show_finished";
@@ -2039,7 +2024,6 @@
          program { name: "prev_btn_show";
             signal: "elm,state,prev_btn,show";
             source: "elm";
-            action: STATE_SET "show" 0.0;
             script {
                emit("elm,state,controlbar_bg,show", "elm");
                set_state(PART:"elm.swallow.prev_btn", "show", 0.0);
@@ -2048,9 +2032,8 @@
          program { name: "prev_btn_hide";
             signal: "elm,state,prev_btn,hide";
             source: "elm";
-            action: STATE_SET "default" 0.0;
             script {
-               emit("elm,state,controlbar_bg,show", "elm");
+               emit("elm,state,controlbar_bg,hide", "elm");
                set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
             }
          }
@@ -2074,19 +2057,16 @@
             source: "elm";
             script {
                set_state(PART:"controlbar_bg", "show", 0.0);
-               ++cbar_bg;
+               set_int(cbar_bg, get_int(cbar_bg) + 1);
             }
          }
          program { name: "controlbar_bg_hide";
             signal: "elm,state,controlbar_bg,hide";
             source: "elm";
             script {
-               --cbar_bg;
-               if (cbar_bg < 1)
-                 {
-                    set_state(PART:"controlbar_bg", "default", 0.0);
-                    cbar_bg = 0;
-                 }
+               set_int(cbar_bg, get_int(cbar_bg) - 1);
+               if (get_int(cbar_bg) <= 0)
+                 set_state(PART:"controlbar_bg", "default", 0.0);
             }
          }
          program { name: "show_finished";
@@ -2552,7 +2532,6 @@
          program { name: "prev_btn_show";
             signal: "elm,state,prev_btn,show";
             source: "elm";
-            action: STATE_SET "show" 0.0;
             script {
                emit("elm,state,controlbar_bg,show", "elm");
                set_state(PART:"elm.swallow.prev_btn", "show", 0.0);
@@ -2561,9 +2540,8 @@
          program { name: "prev_btn_hide";
             signal: "elm,state,prev_btn,hide";
             source: "elm";
-            action: STATE_SET "default" 0.0;
             script {
-               emit("elm,state,controlbar_bg,show", "elm");
+               emit("elm,state,controlbar_bg,hide", "elm");
                set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
             }
          }
@@ -2625,19 +2603,16 @@
             source: "elm";
             script {
                set_state(PART:"controlbar_bg", "show", 0.0);
-               ++cbar_bg;
+               set_int(cbar_bg, get_int(cbar_bg) + 1);
             }
          }
          program { name: "controlbar_bg_hide";
             signal: "elm,state,controlbar_bg,hide";
             source: "elm";
             script {
-               --cbar_bg;
-               if (cbar_bg < 1)
-                 {
-                    set_state(PART:"controlbar_bg", "default", 0.0);
-                    cbar_bg = 0;
-                 }
+               set_int(cbar_bg, get_int(cbar_bg) - 1);
+               if (get_int(cbar_bg) <= 0)
+                 set_state(PART:"controlbar_bg", "default", 0.0);
             }
          }
          program { name: "optionheader_show";
@@ -3194,7 +3169,6 @@
          program { name: "prev_btn_show";
             signal: "elm,state,prev_btn,show";
             source: "elm";
-            action: STATE_SET "show" 0.0;
             script {
                emit("elm,state,controlbar_bg,show", "elm");
                set_state(PART:"elm.swallow.prev_btn", "show", 0.0);
@@ -3203,9 +3177,8 @@
          program { name: "prev_btn_hide";
             signal: "elm,state,prev_btn,hide";
             source: "elm";
-            action: STATE_SET "default" 0.0;
             script {
-               emit("elm,state,controlbar_bg,show", "elm");
+               emit("elm,state,controlbar_bg,hide", "elm");
                set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
             }
          }
@@ -3267,19 +3240,16 @@
             source: "elm";
             script {
                set_state(PART:"controlbar_bg", "show", 0.0);
-               ++cbar_bg;
+               set_int(cbar_bg, get_int(cbar_bg) + 1);
             }
          }
          program { name: "controlbar_bg_hide";
             signal: "elm,state,controlbar_bg,hide";
             source: "elm";
             script {
-               --cbar_bg;
-               if (cbar_bg < 1)
-                 {
-                    set_state(PART:"controlbar_bg", "default", 0.0);
-                    cbar_bg = 0;
-                 }
+               set_int(cbar_bg, get_int(cbar_bg) - 1);
+               if (get_int(cbar_bg) <= 0)
+                 set_state(PART:"controlbar_bg", "default", 0.0);
             }
          }
          program { name: "optionheader_show";
@@ -3690,7 +3660,6 @@
          program { name: "prev_btn_show";
             signal: "elm,state,prev_btn,show";
             source: "elm";
-            action: STATE_SET "show" 0.0;
             script {
                emit("elm,state,controlbar_bg,show", "elm");
                set_state(PART:"elm.swallow.prev_btn", "show", 0.0);
@@ -3699,9 +3668,8 @@
          program { name: "prev_btn_hide";
             signal: "elm,state,prev_btn,hide";
             source: "elm";
-            action: STATE_SET "default" 0.0;
             script {
-               emit("elm,state,controlbar_bg,show", "elm");
+               emit("elm,state,controlbar_bg,hide", "elm");
                set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
             }
          }
@@ -3749,19 +3717,16 @@
             source: "elm";
             script {
                set_state(PART:"controlbar_bg", "show", 0.0);
-               ++cbar_bg;
+               set_int(cbar_bg, get_int(cbar_bg) + 1);
             }
          }
          program { name: "controlbar_bg_hide";
             signal: "elm,state,controlbar_bg,hide";
             source: "elm";
             script {
-               --cbar_bg;
-               if (cbar_bg < 1)
-                 {
-                    set_state(PART:"controlbar_bg", "default", 0.0);
-                    cbar_bg = 0;
-                 }
+               set_int(cbar_bg, get_int(cbar_bg) - 1);
+               if (get_int(cbar_bg) <= 0)
+                 set_state(PART:"controlbar_bg", "default", 0.0);
             }
          }
          program { name: "show_finished";
@@ -3880,7 +3845,6 @@
          program { name: "prev_btn_show";
             signal: "elm,state,prev_btn,show";
             source: "elm";
-            action: STATE_SET "show" 0.0;
             script {
                emit("elm,state,controlbar_bg,show", "elm");
                set_state(PART:"elm.swallow.prev_btn", "show", 0.0);
@@ -3889,9 +3853,8 @@
          program { name: "prev_btn_hide";
             signal: "elm,state,prev_btn,hide";
             source: "elm";
-            action: STATE_SET "default" 0.0;
             script {
-               emit("elm,state,controlbar_bg,show", "elm");
+               emit("elm,state,controlbar_bg,hide", "elm");
                set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
             }
          }
@@ -3915,19 +3878,16 @@
             source: "elm";
             script {
                set_state(PART:"controlbar_bg", "show", 0.0);
-               ++cbar_bg;
+               set_int(cbar_bg, get_int(cbar_bg) + 1);
             }
          }
          program { name: "controlbar_bg_hide";
             signal: "elm,state,controlbar_bg,hide";
             source: "elm";
             script {
-               --cbar_bg;
-               if (cbar_bg < 1)
-                 {
-                    set_state(PART:"controlbar_bg", "default", 0.0);
-                    cbar_bg = 0;
-                 }
+               set_int(cbar_bg, get_int(cbar_bg) - 1);
+               if (get_int(cbar_bg) <= 0)
+                 set_state(PART:"controlbar_bg", "default", 0.0);
             }
          }
          program { name: "show_finished";
Domain: UI Framework / EFL;