summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Williams <andy@andywilliams.me>2017-03-11 23:11:10 +0000
committerAndy Williams <andy@andywilliams.me>2017-03-11 23:11:10 +0000
commit17c04aef7f43bbf065758c9cd35aea9ab4535820 (patch)
tree5af4ebb9e510d42c255e0e1b16d0fdb95044423e
parentc57daa030d27c954a06c18dbbe8ff74b800c39d6 (diff)
luncher: Smoothing engage theme
-rw-r--r--data/elementary/themes/edc/luncher.edc18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/elementary/themes/edc/luncher.edc b/data/elementary/themes/edc/luncher.edc
index 9b1779c2de..9d65e1dfd0 100644
--- a/data/elementary/themes/edc/luncher.edc
+++ b/data/elementary/themes/edc/luncher.edc
@@ -45,8 +45,8 @@ group { name: "e/gadget/luncher/icon";
45 public style; 45 public style;
46 public current_size; 46 public current_size;
47 public Float:engage_scale(cursorpos, iconpos, size) { 47 public Float:engage_scale(cursorpos, iconpos, size) {
48 new Float:zoom = 1.5; 48 new Float:zoom = 1.75;
49 new Float:scale = (zoom+0.25) - (abs(cursorpos-(iconpos+size/3)) / (size*3)); 49 new Float:scale = zoom - (abs(cursorpos-(iconpos+size/2)) / (size*4));
50 if (scale < 1.0) scale = 1.0; 50 if (scale < 1.0) scale = 1.0;
51 if (scale > zoom) scale = zoom; 51 if (scale > zoom) scale = zoom;
52 52
@@ -96,7 +96,7 @@ group { name: "e/gadget/luncher/icon";
96 new Float:scale = 1.0; 96 new Float:scale = 1.0;
97 if (pos == 0 && (xpos >= x) && (xpos <= (x+w))) { 97 if (pos == 0 && (xpos >= x) && (xpos <= (x+w))) {
98 scale = engage_scale(ypos, y, h); 98 scale = engage_scale(ypos, y, h);
99 new Float:halfscale = scale/2; 99 new Float:halfscale = scale/2.0;
100 100
101 custom_state(PART:"sizer", "default", 0.0); 101 custom_state(PART:"sizer", "default", 0.0);
102 set_state_val(PART:"sizer", STATE_REL1, 0.0, 0.5-halfscale); 102 set_state_val(PART:"sizer", STATE_REL1, 0.0, 0.5-halfscale);
@@ -105,7 +105,7 @@ group { name: "e/gadget/luncher/icon";
105 } 105 }
106 else if (pos == 1 && (ypos >= y) && (ypos <= (y+h))) { 106 else if (pos == 1 && (ypos >= y) && (ypos <= (y+h))) {
107 scale = engage_scale(xpos, x, w); 107 scale = engage_scale(xpos, x, w);
108 new Float:halfscale = scale/2; 108 new Float:halfscale = scale/2.0;
109 109
110 custom_state(PART:"sizer", "default", 0.0); 110 custom_state(PART:"sizer", "default", 0.0);
111 set_state_val(PART:"sizer", STATE_REL1, 0.5-halfscale, 0.0); 111 set_state_val(PART:"sizer", STATE_REL1, 0.5-halfscale, 0.0);
@@ -114,7 +114,7 @@ group { name: "e/gadget/luncher/icon";
114 } 114 }
115 else if (pos == 2 && (xpos >= x) && (xpos <= (x+w))) { 115 else if (pos == 2 && (xpos >= x) && (xpos <= (x+w))) {
116 scale = engage_scale(ypos, y, h); 116 scale = engage_scale(ypos, y, h);
117 new Float:halfscale = scale/2; 117 new Float:halfscale = scale/2.0;
118 118
119 custom_state(PART:"sizer", "default", 0.0); 119 custom_state(PART:"sizer", "default", 0.0);
120 set_state_val(PART:"sizer", STATE_REL1, 1.0-scale, 0.5-halfscale); 120 set_state_val(PART:"sizer", STATE_REL1, 1.0-scale, 0.5-halfscale);
@@ -123,7 +123,7 @@ group { name: "e/gadget/luncher/icon";
123 } 123 }
124 else if (pos == 3 && (ypos >= y) && (ypos <= (y+h))) { 124 else if (pos == 3 && (ypos >= y) && (ypos <= (y+h))) {
125 scale = engage_scale(xpos, x, w); 125 scale = engage_scale(xpos, x, w);
126 new Float:halfscale = scale/2; 126 new Float:halfscale = scale/2.0;
127 127
128 custom_state(PART:"sizer", "default", 0.0); 128 custom_state(PART:"sizer", "default", 0.0);
129 set_state_val(PART:"sizer", STATE_REL1, 0.5-halfscale, 1.0-scale); 129 set_state_val(PART:"sizer", STATE_REL1, 0.5-halfscale, 1.0-scale);
@@ -157,7 +157,7 @@ group { name: "e/gadget/luncher/icon";
157 clip_to: "item_clip"; 157 clip_to: "item_clip";
158 mouse_events: 0; 158 mouse_events: 0;
159 description { 159 description {
160 align: 0 0; 160 align: 0.5 0.5;
161 state: "default" 0.0; 161 state: "default" 0.0;
162 rel1.relative: 0.0 0.0; 162 rel1.relative: 0.0 0.0;
163 rel2.relative: 1.0 1.0; 163 rel2.relative: 1.0 1.0;
@@ -252,14 +252,14 @@ group { name: "e/gadget/luncher/icon";
252 description { state: "on_right" 0.0; 252 description { state: "on_right" 0.0;
253 inherit: "default" 0.0; 253 inherit: "default" 0.0;
254 align: 0.0 0.5; 254 align: 0.0 0.5;
255 rel2.relative: 0.965 1.0; 255 rel2.relative: 0.945 1.0;
256 rel1.offset: 2 1; 256 rel1.offset: 2 1;
257 rel2.offset: -1 -1; 257 rel2.offset: -1 -1;
258 } 258 }
259 description { state: "on_bottom" 0.0; 259 description { state: "on_bottom" 0.0;
260 inherit: "default" 0.0; 260 inherit: "default" 0.0;
261 align: 0.5 0.0; 261 align: 0.5 0.0;
262 rel2.relative: 1.0 0.965; 262 rel2.relative: 1.0 0.945;
263 rel1.offset: 1 2; 263 rel1.offset: 1 2;
264 rel2.offset: -1 -1; 264 rel2.offset: -1 -1;
265 } 265 }