button - fixed button invisible problem (navigationbar, controlbar, button style)

diff --git a/themes/groups/button.edc b/themes/groups/button.edc
index bb31eaa..6c96684 100644 (file)
--- a/themes/groups/button.edc
+++ b/themes/groups/button.edc
@@ -9011,10 +9011,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                   set_state(PART:"icon_rect", "visible", 0.0);
                   set_state(PART:"padding_after_icon", "visible", 0.0);
                }
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
+               set_state(PART:"elm.text", "visible", 0.0);
             }
          }
          program { name: "text_hide";
@@ -9071,6 +9068,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
          program { name: "disable_text";
             script {
                set_int(button_state, BUTTON_STATE_DISABLED);
+               set_state(PART:"elm.text", "visible", 0.0);
             }
          }
          program { name: "enable";
@@ -9084,6 +9082,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
          program { name: "enable_text";
             script {
                set_int(button_state, BUTTON_STATE_ENABLED);
+               set_state(PART:"elm.text", "visible", 0.0);
             }
          }
          program { name: "focused";
@@ -9400,10 +9399,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                   set_state(PART:"icon_rect", "visible", 0.0);
                   set_state(PART:"padding_after_icon", "visible", 0.0);
                }
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
+               set_state(PART:"elm.text", "visible", 0.0);
             }
          }
          program { name: "text_hide";
@@ -9460,6 +9456,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
          program { name: "disable_text";
             script {
                set_int(button_state, BUTTON_STATE_DISABLED);
+               set_state(PART:"elm.text", "visible", 0.0);
             }
          }
          program { name: "enable";
@@ -9473,6 +9470,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
          program { name: "enable_text";
             script {
                set_int(button_state, BUTTON_STATE_ENABLED);
+               set_state(PART:"elm.text", "visible", 0.0);
             }
          }
          program { name: "focused";
@@ -9789,10 +9787,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                   set_state(PART:"icon_rect", "visible", 0.0);
                   set_state(PART:"padding_after_icon", "visible", 0.0);
                }
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
+               set_state(PART:"elm.text", "visible", 0.0);
             }
          }
          program { name: "text_hide";
@@ -9849,6 +9844,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
          program { name: "disable_text";
             script {
                set_int(button_state, BUTTON_STATE_DISABLED);
+               set_state(PART:"elm.text", "visible", 0.0);
             }
          }
          program { name: "enable";
@@ -9862,6 +9858,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
          program { name: "enable_text";
             script {
                set_int(button_state, BUTTON_STATE_ENABLED);
+               set_state(PART:"elm.text", "visible", 0.0);
             }
          }
          program { name: "focused";