Fixed the sizing issue in Popup default button styles and some indentation issues.

Change-Id: I58d5e2ed6b6a583da3a3676b3920f5bef1b764e9

diff --git a/themes/groups/button.edc b/themes/groups/button.edc
index ca17595..5148768 100644 (file)
--- a/themes/groups/button.edc
+++ b/themes/groups/button.edc
@@ -136,8 +136,8 @@
                min: 24 24;
                max: 24 24;
                fixed: 1 0;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
                align: 0.0 0.5;
@@ -208,7 +208,7 @@
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
-            description { state: "icononly" 0.0;;
+            description { state: "icononly" 0.0;
                visible: 1;
                min: 30 30;
                max: 30 30;
@@ -603,8 +603,8 @@
                min: 24 24;
                max: 24 24;
                fixed: 1 0;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
                align: 0.0 0.5;
@@ -675,7 +675,7 @@
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
-            description { state: "icononly" 0.0;;
+            description { state: "icononly" 0.0;
                visible: 1;
                min: 30 30;
                max: 30 30;
@@ -1060,8 +1060,8 @@
                visible: 1;
                min: 0 28;
                fixed: 1 0;
-               rel1 {relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_bottom"; }
+               rel1 { relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_bottom"; }
                align: 0.0 0.5;
                color: 0 0 0 0;
             }
@@ -1097,24 +1097,24 @@
             description { state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
                fixed: 1 0;
             }
             description { state: "visible" 0.0;
                fixed: 1 0;
                visible: 1;
                align: 0.0 0.5;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
-            description { state: "icononly" 0.0;;
+            description { state: "icononly" 0.0;
                visible: 1;
                min: 28 28;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
                align: 0.5 0.5;
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
@@ -1492,8 +1492,8 @@
                visible: 1;
                min: 0 36;
                fixed: 1 0;
-               rel1 {relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_bottom"; }
+               rel1 { relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_bottom"; }
                align: 0.0 0.5;
                color: 0 0 0 0;
             }
@@ -1529,24 +1529,24 @@
             description { state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
                fixed: 1 0;
             }
             description { state: "visible" 0.0;
                fixed: 1 0;
                visible: 1;
                align: 0.0 0.5;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
-            description { state: "icononly" 0.0;;
+            description { state: "icononly" 0.0;
                visible: 1;
                min: 36 36;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
                align: 0.5 0.5;
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
@@ -1921,8 +1921,8 @@
                visible: 1;
                min: 0 40;
                fixed: 1 0;
-               rel1 {relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_bottom"; }
+               rel1 { relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_bottom"; }
                align: 0.0 0.5;
                color: 0 0 0 0;
             }
@@ -1958,24 +1958,24 @@
             description { state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
                fixed: 1 0;
             }
             description { state: "visible" 0.0;
                fixed: 1 0;
                visible: 1;
                align: 0.0 0.5;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
-            description { state: "icononly" 0.0;;
+            description { state: "icononly" 0.0;
                visible: 1;
                min: 40 40;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
                align: 0.5 0.5;
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
@@ -2346,8 +2346,8 @@
                visible: 1;
                min: 0 40;
                fixed: 1 0;
-               rel1 {relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_bottom"; }
+               rel1 { relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_bottom"; }
                align: 0.0 0.5;
                color: 0 0 0 0;
             }
@@ -2383,24 +2383,24 @@
             description { state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
                fixed: 1 0;
             }
             description { state: "visible" 0.0;
                fixed: 1 0;
                visible: 1;
                align: 0.0 0.5;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
-            description { state: "icononly" 0.0;;
+            description { state: "icononly" 0.0;
                visible: 1;
                min: 40 40;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
                align: 0.5 0.5;
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
@@ -2772,8 +2772,8 @@
                visible: 1;
                min: 0 40;
                fixed: 1 0;
-               rel1 {relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_bottom"; }
+               rel1 { relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_bottom"; }
                align: 0.0 0.5;
                color: 0 0 0 0;
             }
@@ -2809,24 +2809,24 @@
             description { state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
                fixed: 1 0;
             }
             description { state: "visible" 0.0;
                fixed: 1 0;
                visible: 1;
                align: 0.0 0.5;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
-            description { state: "icononly" 0.0;;
+            description { state: "icononly" 0.0;
                visible: 1;
                min: 40 40;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
                align: 0.5 0.5;
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
@@ -3121,7 +3121,6 @@
             scale: 1;
             description { state: "default" 0.0;
                min: 18 46;
-               max: 400 46;
                image {
                   normal: "00_button_popup_normal.png";
                   border: 4 4 4 4;
@@ -3150,91 +3149,68 @@
             align: 0.0 0.0;
             rel1.relative: 0.0 0.0;
             rel2.relative: 0.0 1.0;
-            min: 10 5;
+            min: 5 5;
             fixed: 1 0;
-            color: 0 0 0 0;
+            visible: 0;
          }
       }
       part {
          name: "padding_right";
          type: RECT;
          scale: 1;
-         mouse_events: 0;
          description { state: "default" 0.0;
             align: 1.0 0.0;
             rel1.relative: 1.0 0.0;
             rel2.relative: 1.0 1.0;
-            min: 10 5;
+            min: 5 5;
             fixed: 1 0;
-            color: 0 0 0 0;
+            visible: 0;
          }
       }
       part {
          name: "padding_top";
          type: RECT;
          scale: 1;
-         mouse_events: 0;
          description { state: "default" 0.0;
             align: 0.0 0.0;
             rel1.relative: 0.0 0.0;
             rel2.relative: 1.0 0.0;
-            min: 5 10;
+            min: 5 5;
             fixed: 0 1;
-            color: 0 0 0 0;
+            visible: 0;
          }
       }
       part {
          name: "padding_bottom";
          type: RECT;
          scale: 1;
-         mouse_events: 0;
          description { state: "default" 0.0;
             align: 1.0 1.0;
             rel1.relative: 0.0 1.0;
             rel2.relative: 1.0 1.0;
-            min: 5 10;
+            min: 5 5;
             fixed: 0 1;
-            color: 0 0 0 0;
-         }
-      }
-      part {
-         name: "icon_rect";
-         type: RECT;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            visible: 1;
-            min: 0 40;
-            fixed: 1 0;
-            rel1 {relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
-            rel2 {relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_bottom"; }
-            align: 0.0 0.5;
-            color: 0 0 0 0;
+            visible: 0;
          }
       }
       part {
          name: "padding_icon_text";
          type: RECT;
          scale: 1;
-         mouse_events: 0;
          description { state: "default" 0.0; //when only icon or no icon is there
             align: 0.0 0.0;
-            rel1 { relative: 1.0 0.0; to: "icon_rect"; }
-            rel2 { relative: 1.0 1.0; to: "icon_rect"; }
+            rel1 { relative: 1.0 0.0; to: "elm.swallow.content"; }
+            rel2 { relative: 1.0 1.0; to: "elm.swallow.content"; }
             fixed: 1 0;
             min: 0 0;
-            color: 0 0 0 0;
+            visible: 0;
          }
          description { state: "icononly" 0.0;
             inherit: "default" 0.0;
          }
          description { state: "visible" 0.0; //when icon is visible
-            align: 0.0 0.0;
-            rel1 { relative: 1.0 0.0; to: "icon_rect"; }
-            rel2 { relative: 1.0 1.0; to: "icon_rect"; }
-            fixed: 1 0;
-            min: 10 0;
-            color: 0 0 0 0;
+            inherit: "default" 0.0;
+            min: 5 0;
          }
       }
       part { name: "elm.swallow.content";
@@ -3243,24 +3219,22 @@
          description { state: "default" 0.0;
             visible: 0;
             align: 0.0 0.5;
-            rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-            rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+            rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+            rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
             fixed: 1 0;
          }
          description { state: "visible" 0.0;
+            inherit: "default" 0.0;
             fixed: 1 0;
             visible: 1;
-            align: 0.0 0.5;
-            rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-            rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
             aspect: 1.0 1.0;
             aspect_preference: VERTICAL;
          }
-         description { state: "icononly" 0.0;;
+         description { state: "icononly" 0.0;
             visible: 1;
             min: 24 24;
-            rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-            rel2 {relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
+            rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+            rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
             align: 0.5 0.5;
             aspect: 1.0 1.0;
             aspect_preference: VERTICAL;
@@ -4011,8 +3985,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                visible: 1;
                min: 0 40;
                fixed: 1 0;
-               rel1 {relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_bottom"; }
+               rel1 { relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_bottom"; }
                align: 0.0 0.5;
                color: 0 0 0 0;
             }
@@ -4048,24 +4022,24 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             description { state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
                fixed: 1 0;
             }
             description { state: "visible" 0.0;
                fixed: 1 0;
                visible: 1;
                align: 0.0 0.5;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
-            description { state: "icononly" 0.0;;
+            description { state: "icononly" 0.0;
                visible: 1;
                min: 40 40;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
                align: 0.5 0.5;
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
@@ -4703,24 +4677,24 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             description { state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
                fixed: 1 0;
             }
             description { state: "visible" 0.0;
                fixed: 1 0;
                visible: 1;
                align: 0.0 0.5;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
-            description { state: "icononly" 0.0;;
+            description { state: "icononly" 0.0;
                visible: 1;
                min: 38 38;
-               rel1 {relative: 1.0 0.0; to_x: "padding_left"; }
-               rel2 {relative: 0.0 1.0; to_x: "padding_right"; }
+               rel1 { relative: 1.0 0.0; to_x: "padding_left"; }
+               rel2 { relative: 0.0 1.0; to_x: "padding_right"; }
                align: 0.5 0.5;
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
@@ -5093,8 +5067,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                visible: 1;
                min: 0 28;
                fixed: 1 0;
-               rel1 {relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_bottom"; }
+               rel1 { relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_bottom"; }
                align: 0.0 0.5;
                color: 0 0 0 0;
             }
@@ -5130,24 +5104,24 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             description { state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
                fixed: 1 0;
             }
             description { state: "visible" 0.0;
                fixed: 1 0;
                visible: 1;
                align: 0.0 0.5;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
-            description { state: "icononly" 0.0;;
+            description { state: "icononly" 0.0;
                visible: 1;
                min: 28 28;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
                align: 0.5 0.5;
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
@@ -5520,8 +5494,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                visible: 1;
                min: 0 40;
                fixed: 1 0;
-               rel1 {relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_bottom"; }
+               rel1 { relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_bottom"; }
                align: 0.0 0.5;
                color: 0 0 0 0;
             }
@@ -5557,24 +5531,24 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             description { state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
                fixed: 1 0;
             }
             description { state: "visible" 0.0;
                fixed: 1 0;
                visible: 1;
                align: 0.0 0.5;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
-            description { state: "icononly" 0.0;;
+            description { state: "icononly" 0.0;
                visible: 1;
                min: 24 24;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
                align: 0.5 0.5;
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
@@ -5946,8 +5920,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                visible: 1;
                min: 0 32;
                fixed: 1 0;
-               rel1 {relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_bottom"; }
+               rel1 { relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_bottom"; }
                align: 0.0 0.5;
                color: 0 0 0 0;
             }
@@ -5983,24 +5957,24 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             description { state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
                fixed: 1 0;
             }
             description { state: "visible" 0.0;
                fixed: 1 0;
                visible: 1;
                align: 0.0 0.5;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
-            description { state: "icononly" 0.0;;
+            description { state: "icononly" 0.0;
                visible: 1;
                min: 32 32;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
                align: 0.5 0.5;
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
@@ -6373,8 +6347,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                visible: 1;
                min: 0 32;
                fixed: 1 0;
-               rel1 {relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_bottom"; }
+               rel1 { relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_bottom"; }
                align: 0.0 0.5;
                color: 0 0 0 0;
             }
@@ -6410,24 +6384,24 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             description { state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
                fixed: 1 0;
             }
             description { state: "visible" 0.0;
                fixed: 1 0;
                visible: 1;
                align: 0.0 0.5;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
-            description { state: "icononly" 0.0;;
+            description { state: "icononly" 0.0;
                visible: 1;
                min: 32 32;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
                align: 0.5 0.5;
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
@@ -6812,8 +6786,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                min: 24 24;
                max: 24 24;
                fixed: 1 0;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
                align: 0.0 0.5;
@@ -6884,7 +6858,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
-            description { state: "icononly" 0.0;;
+            description { state: "icononly" 0.0;
                visible: 1;
                min: 30 30;
                max: 30 30;
@@ -7183,8 +7157,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               rel1 { to_x: "padding.left"; to_y: "elm.text";}
-               rel2 { to_x: "padding.right"; to_y: "elm.text";}
+               rel1 { to_x: "padding.left"; to_y: "elm.text"; }
+               rel2 { to_x: "padding.right"; to_y: "elm.text"; }
                min: 44 28;
                     color: 221 134 21 255;
             }
@@ -7207,7 +7181,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                fixed: 1 0;
                color: 0 0 0 0;
                rel1.relative: 0 0;
-               rel2 { relative: 0.0 1.0; to_x: "elm.text";}
+               rel2 { relative: 0.0 1.0; to_x: "elm.text"; }
                align: 1 0;
             }
          }
@@ -7219,7 +7193,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                min: 10 1;
                fixed: 1 0;
                color: 0 0 0 0;
-               rel1 { relative: 1.0 0.0; to_x: "elm.text";}
+               rel1 { relative: 1.0 0.0; to_x: "elm.text"; }
                rel2.relative: 1.0 1.0;
                align: 0 0;
             }
@@ -7467,8 +7441,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               rel1 { to_x: "padding.left"; to_y: "elm.text";}
-               rel2 { to_x: "padding.right"; to_y: "elm.text";}
+               rel1 { to_x: "padding.left"; to_y: "elm.text"; }
+               rel2 { to_x: "padding.right"; to_y: "elm.text"; }
                min: 28 26;
                fixed: 1 1;
                image {
@@ -7496,7 +7470,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                fixed: 1 0;
                color: 0 0 0 0;
                rel1.relative: 0 0;
-               rel2 { relative: 0.0 1.0; to_x: "elm.text";}
+               rel2 { relative: 0.0 1.0; to_x: "elm.text"; }
                align: 1 0;
             }
          }
@@ -7508,7 +7482,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                min: 10 1;
                fixed: 1 0;
                color: 0 0 0 0;
-               rel1 { relative: 1.0 0.0; to_x: "elm.text";}
+               rel1 { relative: 1.0 0.0; to_x: "elm.text"; }
                rel2.relative: 1.0 1.0;
                align: 0 0;
             }
@@ -8013,8 +7987,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                min: 20 20;
                max: 20 20;
                align: 0.5 0.5;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
                image.normal: "00_picker_arrow_left.png";
             }
             description { state: "clicked" 0.0;
@@ -8243,8 +8217,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                min: 20 20;
                max: 20 20;
                align: 0.5 0.5;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; }
                image.normal: "00_picker_arrow_right.png";
             }
             description { state: "clicked" 0.0;
@@ -8483,8 +8457,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                visible: 1;
                min: 40 40;
                fixed: 1 0;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
                align: 0.0 0.5;
@@ -8555,7 +8529,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
-            description { state: "icononly" 0.0;;
+            description { state: "icononly" 0.0;
                visible: 1;
                min: 40 40;
                rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
@@ -8937,8 +8911,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                visible: 1;
                min: 22 22;
                fixed: 1 0;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
                align: 0.0 0.5;
                color: 0 0 0 0;
             }
@@ -9007,7 +8981,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
-            description { state: "icononly" 0.0;;
+            description { state: "icononly" 0.0;
                visible: 1;
                min: 30 30;
                max: 30 30;
@@ -9384,8 +9358,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                visible: 1;
                min: 22 22;
                fixed: 1 0;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
                align: 0.0 0.5;
                color: 0 0 0 0;
             }
@@ -9454,7 +9428,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
-            description { state: "icononly" 0.0;;
+            description { state: "icononly" 0.0;
                visible: 1;
                min: 30 30;
                max: 30 30;
@@ -9831,8 +9805,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                visible: 1;
                min: 22 22;
                fixed: 1 0;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
                align: 0.0 0.5;
                color: 0 0 0 0;
             }
@@ -9901,7 +9875,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
-            description { state: "icononly" 0.0;;
+            description { state: "icononly" 0.0;
                visible: 1;
                min: 30 30;
                max: 30 30;
@@ -10289,8 +10263,8 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                min: 24 24;
                max: 24 24;
                fixed: 1 0;
-               rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
-               rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
+               rel1 { relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
                align: 0.0 0.5;
@@ -10361,7 +10335,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
-            description { state: "icononly" 0.0;;
+            description { state: "icononly" 0.0;
                visible: 1;
                min: 30 20;
                max: 30 20;