TH - shelf/gadgets - add paddingh/spacing to be less crammed

1 files changed, 49 insertions, 45 deletions

diff --git a/data/elementary/themes/edc/tasks.edc b/data/elementary/themes/edc/tasks.edc
index 777f2049b5..f977e62612 100644
--- a/data/elementary/themes/edc/tasks.edc
+++ b/data/elementary/themes/edc/tasks.edc
@@ -21,8 +21,12 @@ group { name:"e/modules/tasks/item";
    parts {
       part { name: "base"; type: RECT; mouse_events: 0;
          clip_to: "clip";
+         scale: 1;
          description { state: "default" 0.0;
             color: 64 64 64 255;
+            rel1.offset: 0 (0 - SHELFPAD);
+            rel2.offset: -1 (SHELFPAD - 1);
+            offscale;
          }
          description { state: "iconic" 0.0;
             inherit: "default" 0.0;
@@ -34,8 +38,12 @@ group { name:"e/modules/tasks/item";
       }
       part { name: "click"; type: RECT; mouse_events: 0;
          clip_to: "clip";
+         scale: 1;
          description { state: "default" 0.0;
             color: 32 32 32 0;
+            rel1.offset: 0 (0 - SHELFPAD);
+            rel2.offset: -1 (SHELFPAD - 1);
+            offscale;
          }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
@@ -231,9 +239,9 @@ group { name:"e/modules/tasks/item";
          description { state: "default" 0.0;
             color: 51 153 255 255;
             align: 0.5 1.0;
-            rel1.offset: 0 -1;
+            rel1.offset: 0 (SHELFPAD - 1);
             rel1.relative: 0.0 1.0;
-            rel2.offset: -1 -1;
+            rel2.offset: -1 (SHELFPAD - 1);
             fixed: 0 1;
             visible: 0;
             min: 0 0;
@@ -259,9 +267,11 @@ group { name:"e/modules/tasks/item";
          }
       }
       part { name: "clip"; type: RECT;
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: -20 -20;
-            rel2.offset: 19 19;
+            rel1.offset: -80 -80;
+            rel2.offset: 79 79;
+            offscale;
             visible: 1;
          }
          description { state: "selected" 0.0;
@@ -275,8 +285,8 @@ group { name:"e/modules/tasks/item";
       }
       part { name: "sel_clip"; type: RECT;
          description { state: "default" 0.0;
-            rel1.offset: -20 -20;
-            rel2.offset: 19 19;
+            rel1.offset: -80 -80;
+            rel2.offset: 79 79;
             visible: 0;
          }
          description { state: "selected" 0.0;
@@ -290,97 +300,82 @@ group { name:"e/modules/tasks/item";
       }
    }
    programs {
-      program {
-         signal: "mouse,down,1"; source: "event";
+      program { signal: "mouse,down,1"; source: "event";
          action: STATE_SET "clicked" 0.0;
          target: "click";
          target: "e.text.label";
          target: "label_focused";
          target: "label_iconic";
       }
-      program {
-         signal: "mouse,up,1"; source: "event";
+      program { signal: "mouse,up,1"; source: "event";
          action: STATE_SET "default" 0.0;
          target: "click";
          target: "e.text.label";
          target: "label_focused";
          target: "label_iconic";
       }
-      program {
-         signal: "mouse,up,clicked,1*"; source: "event";
+      program { signal: "mouse,up,clicked,1*"; source: "event";
          action: SIGNAL_EMIT "e,action,click" "";
       }
 
-      program {
-         signal: "e,state,focused"; source: "e";
+      program { signal: "e,state,focused"; source: "e";
          action: STATE_SET "focused" 0.0;
          transition: ACCELERATE 0.2;
          target: "bar";
       }
-      program {
-         signal: "e,state,unfocused"; source: "e";
+      program { signal: "e,state,unfocused"; source: "e";
          action: STATE_SET "default" 0.0;
          transition: DECELERATE 0.2;
          target: "bar";
       }
 
-      program {
-         signal: "state,default"; source: "int";
+      program { signal: "state,default"; source: "int";
          action: STATE_SET "default" 0.0;
          target: "normal_clip";
          target: "focused_clip";
          target: "iconic_clip";
          target: "base";
       }
-      program {
-         signal: "state,default"; source: "int";
+      program { signal: "state,default"; source: "int";
          action: STATE_SET "default" 0.0;
          transition: SINUSOIDAL 0.2;
          target: "icon2";
       }
-      program {
-         signal: "state,focused"; source: "int";
+      program { signal: "state,focused"; source: "int";
          action: STATE_SET "focused" 0.0;
          target: "normal_clip";
          target: "focused_clip";
          target: "iconic_clip";
          target: "base";
       }
-      program {
-         signal: "state,focused"; source: "int";
+      program { signal: "state,focused"; source: "int";
          action: STATE_SET "focused" 0.0;
          transition: SINUSOIDAL 0.2;
          target: "icon2";
       }
-      program {
-         signal: "state,iconic"; source: "int";
+      program { signal: "state,iconic"; source: "int";
          action: STATE_SET "iconic" 0.0;
          target: "normal_clip";
          target: "focused_clip";
          target: "iconic_clip";
          target: "base";
       }
-      program {
-         signal: "state,iconic"; source: "int";
+      program { signal: "state,iconic"; source: "int";
          action: STATE_SET "iconic" 0.0;
          transition: SINUSOIDAL 0.2;
          target: "icon2";
       }
 
-      program {
-         signal: "e,state,focused"; source: "e";
+      program { signal: "e,state,focused"; source: "e";
          script { set_focused(1); }
       }
-      program {
-         signal: "e,state,unfocused"; source: "e";
+      program { signal: "e,state,unfocused"; source: "e";
          script { set_focused(0); }
       }
-      program {
-         signal: "e,state,iconified"; source: "e";
+      program { signal: "e,state,iconified"; source: "e";
          script { set_iconic(1); }
       }
-      program {
-         signal: "e,state,uniconified"; source: "e";
+      program { signal: "e,state,uniconified"; source: "e";
          script { set_iconic(0); }
       }
 
@@ -398,8 +393,7 @@ group { name:"e/modules/tasks/item";
          target: "urgent";
          after: "urg1";
       }
-      program {
-         signal: "e,state,not_urgent"; source: "e";
+      program { signal: "e,state,not_urgent"; source: "e";
          action: ACTION_STOP;
          target: "urg1";
          target: "urg2";
@@ -410,15 +404,13 @@ group { name:"e/modules/tasks/item";
          target: "urgent";
       }
 
-      program {
-         signal: "e,state,icon_only"; source: "e";
+      program { signal: "e,state,icon_only"; source: "e";
          action: STATE_SET "icon_only" 0.0;
          target: "icon";
          target: "icon_clip";
          target: "label_clip";
       }
-      program {
-         signal: "e,state,text_only"; source: "e";
+      program { signal: "e,state,text_only"; source: "e";
          action: STATE_SET "text_only" 0.0;
          target: "icon";
          target: "icon_clip";
@@ -449,6 +441,19 @@ group { name:"e/modules/tasks/item_vert";
       }
    }
    parts {
+      part { name: "base"; type: RECT; mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1.offset: (0 - SHELFPAD) 0;
+            rel2.offset: (SHELFPAD - 1) -1;
+         }
+         description { state: "iconic" 0.0;
+            inherit: "default" 0.0;
+         }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            color: 40 40 40 255;
+         }
+      }
       part { name: "e.text.label";
          description { state: "default" 0.0;
             rel.to: "icon";
@@ -507,16 +512,15 @@ group { name:"e/modules/tasks/item_vert";
       part { name: "bar"; type: RECT;
          description { state: "default" 0.0;
             align: 1.0 0.5;
+            rel1.offset: 2 0;
             rel1.relative: 1.0 0.0;
-            rel2.offset: -1 -1;
+            rel2.offset: 2 -1;
             fixed: 1 0;
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
             align: 1.0 0.5;
             rel1.relative: 1.0 0.0;
-            rel1.offset: -1 0;
-            rel2.offset: -1 -1;
             fixed: 1 0;
             min: 5 0;
             visible: 1;