[elc_naviframe]: Bug fix: when back button is made as NULL or hidden

the bg should also be hidden.
[elm_button]: group name changed to naviframe/more/default for more
icon button.

diff --git a/themes/widgets/button.edc b/themes/widgets/button.edc
index 3d7a7f4..74904f4 100644 (file)
--- a/themes/widgets/button.edc
+++ b/themes/widgets/button.edc
@@ -7101,7 +7101,7 @@
    }
 
 /////////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/naviframe/title_icon/default";
+   group { name: "elm/button/base/naviframe/more/default";
       images {
          image: "00_Title_btn.png" COMP;
          image: "00_Title_btn_press.png" COMP;

diff --git a/themes/widgets/naviframe.edc b/themes/widgets/naviframe.edc
index 618ddb0..bf213cb 100644 (file)
--- a/themes/widgets/naviframe.edc
+++ b/themes/widgets/naviframe.edc
@@ -440,14 +440,17 @@
             scale: 1;
             clip_to: "controlbar_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
-               max: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
-               fixed: 1 1;
+               min: 0 0;
+               fixed: 1 0;
                align: 1.0 0.0;
                rel1 { relative: 1.0 0.0; to: "controlbar_bg"; }
                rel2.to: "controlbar_bg";
                visible: 0;
             }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC 0;
+            }
          }
          part { name: "elm.swallow.prev_btn";
             type: SWALLOW;
@@ -569,6 +572,7 @@
             source: "elm";
             script {
                emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.prev_btn_bg", "visible", 0.0);
             }
          }
          program { name: "prev_btn_hide";
@@ -576,6 +580,7 @@
             source: "elm";
             script {
                emit("elm,state,controlbar_bg,hide", "elm");
+               set_state(PART:"elm.prev_btn_bg", "default", 0.0);
             }
          }
          program { name: "left_btn_show";
@@ -1323,14 +1328,17 @@
             scale: 1;
             clip_to: "controlbar_clip";
             description { state: "default" 0.0;
-               min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
-               max: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
-               fixed: 1 1;
+               min: 0 0;
+               fixed: 1 0;
                align: 1.0 0.0;
                rel1 { relative: 1.0 0.0; to: "controlbar_bg"; }
                rel2.to: "controlbar_bg";
                visible: 0;
             }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC 0;
+            }
          }
          part { name: "elm.swallow.prev_btn";
             type: SWALLOW;
@@ -1452,6 +1460,7 @@
             source: "elm";
             script {
                emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.prev_btn_bg", "visible", 0.0);
             }
          }
          program { name: "prev_btn_hide";
@@ -1459,6 +1468,7 @@
             source: "elm";
             script {
                emit("elm,state,controlbar_bg,hide", "elm");
+               set_state(PART:"elm.prev_btn_bg", "default", 0.0);
             }
          }
          program { name: "left_btn_show";
@@ -2036,19 +2046,22 @@
             }
          }
          part { name: "elm.prev_btn_bg";
-           type: RECT;
-           scale: 1;
-           clip_to: "controlbar_clip";
-           description { state: "default" 0.0;
-              min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
-              max: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
-              fixed: 1 1;
-              align: 1.0 0.0;
-              rel1 { relative: 1.0 0.0; to: "controlbar_bg"; }
-              rel2.to: "controlbar_bg";
-              visible: 0;
-           }
-        }
+            type: RECT;
+            scale: 1;
+            clip_to: "controlbar_clip";
+            description { state: "default" 0.0;
+               min: 0 0;
+               fixed: 1 0;
+               align: 1.0 0.0;
+               rel1 { relative: 1.0 0.0; to: "controlbar_bg"; }
+               rel2.to: "controlbar_bg";
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC 0;
+            }
+         }
         part { name: "elm.swallow.prev_btn";
            type: SWALLOW;
            scale: 1;
@@ -2158,6 +2171,7 @@
             source: "elm";
             script {
                emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.prev_btn_bg", "visible", 0.0);
             }
          }
          program { name: "prev_btn_hide";
@@ -2165,6 +2179,7 @@
             source: "elm";
             script {
                emit("elm,state,controlbar_bg,hide", "elm");
+               set_state(PART:"elm.prev_btn_bg", "default", 0.0);
             }
          }
          program { name: "controlbar_show";
@@ -2322,35 +2337,38 @@
            scale: 1;
            clip_to: "controlbar_clip";
            description { state: "default" 0.0;
-              min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
-              max: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
-              fixed: 1 1;
+              min: 0 0;
+              fixed: 1 0;
               align: 1.0 0.0;
               rel1 { relative: 1.0 0.0; to: "controlbar_bg"; }
               rel2.to: "controlbar_bg";
               visible: 0;
            }
-        }
-        part { name: "elm.swallow.prev_btn";
-           type: SWALLOW;
-           scale: 1;
-           clip_to: "controlbar_clip";
-           description { state: "default" 0.0;
-              fixed: 1 1;
-              align: 0.5 0.5;
-              rel1.to: "elm.prev_btn_bg";
-              rel2.to: "elm.prev_btn_bg";
-           }
-        }
-        part { name: "elm.swallow.controlbar";
-           type: SWALLOW;
-           scale: 1;
-           clip_to: "controlbar_clip";
-           description { state: "default" 0.0;
-              rel1.to: "controlbar_bg";
-              rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
+           description { state: "visible" 0.0;
+              inherit: "default" 0.0;
+              min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC 0;
            }
-        }
+         }
+         part { name: "elm.swallow.prev_btn";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "controlbar_clip";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               align: 0.5 0.5;
+               rel1.to: "elm.prev_btn_bg";
+               rel2.to: "elm.prev_btn_bg";
+            }
+         }
+         part { name: "elm.swallow.controlbar";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "controlbar_clip";
+            description { state: "default" 0.0;
+               rel1.to: "controlbar_bg";
+               rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
+            }
+         }
       }
       programs {
          program { name: "content_new_pushed";
@@ -2428,6 +2446,7 @@
             source: "elm";
             script {
                emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.prev_btn_bg", "visible", 0.0);
             }
          }
          program { name: "prev_btn_hide";
@@ -2435,6 +2454,7 @@
             source: "elm";
             script {
                emit("elm,state,controlbar_bg,hide", "elm");
+               set_state(PART:"elm.prev_btn_bg", "default", 0.0);
             }
          }
          program { name: "controlbar_show";
@@ -2906,19 +2926,22 @@
             }
          }
          part { name: "elm.prev_btn_bg";
-           type: RECT;
-           scale: 1;
-           clip_to: "controlbar_clip";
-           description { state: "default" 0.0;
-              min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
-              max: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
-              fixed: 1 1;
-              align: 1.0 0.0;
-              rel1 { relative: 1.0 0.0; to: "controlbar_bg"; }
-              rel2.to: "controlbar_bg";
-              visible: 0;
-           }
-        }
+            type: RECT;
+            scale: 1;
+            clip_to: "controlbar_clip";
+            description { state: "default" 0.0;
+               min: 0 0;
+               fixed: 1 0;
+               align: 1.0 0.0;
+               rel1 { relative: 1.0 0.0; to: "controlbar_bg"; }
+               rel2.to: "controlbar_bg";
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC 0;
+            }
+         }
         part { name: "elm.swallow.prev_btn";
            type: SWALLOW;
            scale: 1;
@@ -2989,6 +3012,7 @@
             source: "elm";
             script {
                emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.prev_btn_bg", "visible", 0.0);
             }
          }
          program { name: "prev_btn_hide";
@@ -2996,6 +3020,7 @@
             source: "elm";
             script {
                emit("elm,state,controlbar_bg,hide", "elm");
+               set_state(PART:"elm.prev_btn_bg", "default", 0.0);
             }
          }
          program { name: "left_btn_show";
@@ -3719,19 +3744,22 @@
             }
          }
          part { name: "elm.prev_btn_bg";
-           type: RECT;
-           scale: 1;
-           clip_to: "controlbar_clip";
-           description { state: "default" 0.0;
-              min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
-              max: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
-              fixed: 1 1;
-              align: 1.0 0.0;
-              rel1 { relative: 1.0 0.0; to: "controlbar_bg"; }
-              rel2.to: "controlbar_bg";
-              visible: 0;
-           }
-        }
+            type: RECT;
+            scale: 1;
+            clip_to: "controlbar_clip";
+            description { state: "default" 0.0;
+               min: 0 0;
+               fixed: 1 0;
+               align: 1.0 0.0;
+               rel1 { relative: 1.0 0.0; to: "controlbar_bg"; }
+               rel2.to: "controlbar_bg";
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC 0;
+            }
+         }
         part { name: "elm.swallow.prev_btn";
            type: SWALLOW;
            scale: 1;
@@ -3802,6 +3830,7 @@
             source: "elm";
             script {
                emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.prev_btn_bg", "visible", 0.0);
             }
          }
          program { name: "prev_btn_hide";
@@ -3809,6 +3838,7 @@
             source: "elm";
             script {
                emit("elm,state,controlbar_bg,hide", "elm");
+               set_state(PART:"elm.prev_btn_bg", "default", 0.0);
             }
          }
          program { name: "left_btn_show";
@@ -4361,19 +4391,22 @@
             }
          }
          part { name: "elm.prev_btn_bg";
-           type: RECT;
-           scale: 1;
-           clip_to: "controlbar_clip";
-           description { state: "default" 0.0;
-              min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
-              max: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
-              fixed: 1 1;
-              align: 1.0 0.0;
-              rel1 { relative: 1.0 0.0; to: "controlbar_bg"; }
-              rel2.to: "controlbar_bg";
-              visible: 0;
-           }
-        }
+            type: RECT;
+            scale: 1;
+            clip_to: "controlbar_clip";
+            description { state: "default" 0.0;
+               min: 0 0;
+               fixed: 1 0;
+               align: 1.0 0.0;
+               rel1 { relative: 1.0 0.0; to: "controlbar_bg"; }
+               rel2.to: "controlbar_bg";
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC 0;
+            }
+         }
         part { name: "elm.swallow.prev_btn";
            type: SWALLOW;
            scale: 1;
@@ -4433,6 +4466,7 @@
             source: "elm";
             script {
                emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.prev_btn_bg", "visible", 0.0);
             }
          }
          program { name: "prev_btn_hide";
@@ -4440,6 +4474,7 @@
             source: "elm";
             script {
                emit("elm,state,controlbar_bg,hide", "elm");
+               set_state(PART:"elm.prev_btn_bg", "default", 0.0);
             }
          }
          program { name: "controlbar_show";
@@ -4573,19 +4608,22 @@
             }
          }
          part { name: "elm.prev_btn_bg";
-           type: RECT;
-           scale: 1;
-           clip_to: "controlbar_clip";
-           description { state: "default" 0.0;
-              min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
-              max: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC CONTROLBAR_SMALL_HEIGHT_INC;
-              fixed: 1 1;
-              align: 1.0 0.0;
-              rel1 { relative: 1.0 0.0; to: "controlbar_bg"; }
-              rel2.to: "controlbar_bg";
-              visible: 0;
-           }
-        }
+            type: RECT;
+            scale: 1;
+            clip_to: "controlbar_clip";
+            description { state: "default" 0.0;
+               min: 0 0;
+               fixed: 1 0;
+               align: 1.0 0.0;
+               rel1 { relative: 1.0 0.0; to: "controlbar_bg"; }
+               rel2.to: "controlbar_bg";
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC 0;
+            }
+         }
         part { name: "elm.swallow.prev_btn";
            type: SWALLOW;
            scale: 1;
@@ -4633,6 +4671,7 @@
             source: "elm";
             script {
                emit("elm,state,controlbar_bg,show", "elm");
+               set_state(PART:"elm.prev_btn_bg", "visible", 0.0);
             }
          }
          program { name: "prev_btn_hide";
@@ -4640,6 +4679,7 @@
             source: "elm";
             script {
                emit("elm,state,controlbar_bg,hide", "elm");
+               set_state(PART:"elm.prev_btn_bg", "default", 0.0);
             }
          }
          program { name: "controlbar_show";