[button] change disabler in controlbar/vertical style

Change-Id: Ibd856f7b1f377f3691a62726fc4ac3496d9e5394

diff --git a/themes/groups/button.edc b/themes/groups/button.edc
index f635cb7..bb31eaa 100644 (file)
--- a/themes/groups/button.edc
+++ b/themes/groups/button.edc
@@ -10025,6 +10025,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
          part { name: "elm.swallow.content";
             type: SWALLOW;
             scale: 1;
+            clip_to: "disabler";
             description { state: "default" 0.0;
                visible: 0;
                align: 0.5 0.0;
@@ -10058,6 +10059,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             type: TEXT;
             mouse_events:  0;
             scale: 1;
+            clip_to: "disabler";
             description { state: "default" 0.0;
                visible: 0;
                rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_after_icon"; }
@@ -10083,17 +10085,6 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                color: 255 255 255 255;
                color2: 0 0 0 102;
             }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 185 185 185 255;
-               color3: 0 0 0 0;
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               color: 185 185 185 255;
-               color3: 0 0 0 0;
-               visible: 1;
-            }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
@@ -10130,11 +10121,12 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
          part { name: "disabler";
             type: RECT;
             description { state: "default" 0.0;
-               color: 0 0 0 0;
-               visible: 0;
+               color: 255 255 255 255;
+               visible: 1;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
+               color: 255 255 255 127;
                visible: 1;
             }
          }
@@ -10210,10 +10202,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";
@@ -10270,14 +10259,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
          }
          program { name: "disable_text";
             script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                  set_state(PART:"elm.text", "disabled_visible", 0.0);
-               else
-                  set_state(PART:"elm.text", "disabled", 0.0);
                set_int(button_state, BUTTON_STATE_DISABLED);
+               set_state(PART:"elm.text", "visible", 0.0);
             }
          }
          program { name: "enable";
@@ -10291,14 +10274,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
          }
          program { name: "enable_text";
             script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "disabled_visible"))
-                  set_state(PART:"elm.text", "visible", 0.0);
-               else
-                  set_state(PART:"elm.text", "default", 0.0);
                set_int(button_state, BUTTON_STATE_ENABLED);
+               set_state(PART:"elm.text", "visible", 0.0);
             }
          }
          program { name: "focused";