summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHermet Park <hermetpark@gmail.com>2020-02-28 11:34:45 +0900
committerHermet Park <hermetpark@gmail.com>2020-02-28 11:34:45 +0900
commit807526214c2ac2c93442fbf088c9f8d98bedd2c9 (patch)
tree402669f8cc88fd8c8b7284c0e0dc5d16013f8dc4
parentdb8ac38db127b7893cba6c277f22772ada47febb (diff)
parentd4a301d81a38c3c5238074ba7b3f14a285738d26 (diff)
Merge branch 'feature/themes/flat' into devs/hermet/lottie
-rw-r--r--data/elementary/themes/edc/border.edc134
-rw-r--r--data/elementary/themes/edc/comp.edc110
-rw-r--r--data/elementary/themes/edc/desklock.edc34
-rw-r--r--data/elementary/themes/edc/elm/border.edc122
-rw-r--r--data/elementary/themes/macros.edc22
5 files changed, 194 insertions, 228 deletions
diff --git a/data/elementary/themes/edc/border.edc b/data/elementary/themes/edc/border.edc
index 385b66ea34..4c6d4cdb0d 100644
--- a/data/elementary/themes/edc/border.edc
+++ b/data/elementary/themes/edc/border.edc
@@ -139,14 +139,14 @@ group { name: "e/widgets/border/default/border";
139 parts { 139 parts {
140 part { name: "shadow_clip"; type: RECT; mouse_events: 0; 140 part { name: "shadow_clip"; type: RECT; mouse_events: 0;
141 description { state: "default"; 141 description { state: "default";
142 rel1.to: "shadow"; 142 rel.to: "shadow";
143 rel2.to: "shadow";
144 } 143 }
145 description { state: "hidden"; 144 description { state: "hidden";
146 visible: 0; 145 visible: 0;
147 } 146 }
148 } 147 }
149 part { name: "shadow"; mouse_events: 0; clip_to: "shadow_clip"; 148 part { name: "shadow"; mouse_events: 0; clip_to: "shadow_clip";
149 scale: 1;
150 description { state: "default" 0.0; 150 description { state: "default" 0.0;
151 rel1.to: "top"; 151 rel1.to: "top";
152 rel2.to: "bottom"; 152 rel2.to: "bottom";
@@ -170,10 +170,10 @@ group { name: "e/widgets/border/default/border";
170 part { name: "e.swallow.client"; type: SWALLOW; 170 part { name: "e.swallow.client"; type: SWALLOW;
171 clip_to: "client_clip"; 171 clip_to: "client_clip";
172 description { state: "default" 0.0; 172 description { state: "default" 0.0;
173 rel1.relative: 0.0 1.0;
174 rel1.to_y: "top"; 173 rel1.to_y: "top";
175 rel2.relative: 1.0 0.0; 174 rel1.relative: 0.0 1.0;
176 rel2.to_y: "bottom"; 175 rel2.to_y: "bottom";
176 rel2.relative: 1.0 0.0;
177 } 177 }
178 description { state: "shaded" 0.0; 178 description { state: "shaded" 0.0;
179 inherit: "default" 0.0; 179 inherit: "default" 0.0;
@@ -187,10 +187,12 @@ group { name: "e/widgets/border/default/border";
187 } 187 }
188 } 188 }
189 part { name: "top"; type: RECT; mouse_events: 0; 189 part { name: "top"; type: RECT; mouse_events: 0;
190// scale: 1;
190 description { state: "default" 0.0; 191 description { state: "default" 0.0;
191 rel2.to_y: "e.text.title"; 192 rel2.to_y: "e.text.title";
192 rel2.offset: -1 3; 193 rel2.offset: -1 3;
193 color: 64 64 64 255; 194 color: 64 64 64 255;
195// offscale;
194 } 196 }
195 description { state: "focused" 0.0; 197 description { state: "focused" 0.0;
196 inherit: "default" 0.0; 198 inherit: "default" 0.0;
@@ -215,6 +217,7 @@ group { name: "e/widgets/border/default/border";
215 min: 0 1; 217 min: 0 1;
216 } 218 }
217 fixed: 0 1; 219 fixed: 0 1;
220// offscale;
218 } 221 }
219 description { state: "focused" 0.0; 222 description { state: "focused" 0.0;
220 inherit: "default" 0.0; 223 inherit: "default" 0.0;
@@ -223,8 +226,7 @@ group { name: "e/widgets/border/default/border";
223 } 226 }
224 part { name: "icon"; type: SPACER; 227 part { name: "icon"; type: SPACER;
225 description { state: "default" 0.0; 228 description { state: "default" 0.0;
226 rel1.to: "e.event.icon"; 229 rel.to: "e.event.icon";
227 rel2.to: "e.event.icon";
228 } 230 }
229 description { state: "bounce1" 0.0; 231 description { state: "bounce1" 0.0;
230 inherit: "default" 0.0; 232 inherit: "default" 0.0;
@@ -239,9 +241,8 @@ group { name: "e/widgets/border/default/border";
239 } 241 }
240 part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0; 242 part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
241 description { state: "default" 0.0; 243 description { state: "default" 0.0;
242 rel1.to: "icon"; 244 rel.to: "icon";
243 rel1.relative: 0.15 0.15; 245 rel1.relative: 0.15 0.15;
244 rel2.to: "icon";
245 rel2.relative: 0.85 0.85; 246 rel2.relative: 0.85 0.85;
246 rel2.offset: 0 0; 247 rel2.offset: 0 0;
247 } 248 }
@@ -260,8 +261,7 @@ group { name: "e/widgets/border/default/border";
260 BUSY("busy_area", "e,state,hung", "e", "e,state,unhung", "e") 261 BUSY("busy_area", "e,state,hung", "e", "e,state,unhung", "e")
261 part { name: "clip1"; type: RECT; mouse_events: 0; 262 part { name: "clip1"; type: RECT; mouse_events: 0;
262 description { state: "default" 0.0; 263 description { state: "default" 0.0;
263 rel1.to: "top"; 264 rel.to: "top";
264 rel2.to: "top";
265 } 265 }
266 description { state: "focused" 0.0; 266 description { state: "focused" 0.0;
267 inherit: "default" 0.0; 267 inherit: "default" 0.0;
@@ -270,8 +270,7 @@ group { name: "e/widgets/border/default/border";
270 } 270 }
271 part { name: "clip2"; type: RECT; mouse_events: 0; 271 part { name: "clip2"; type: RECT; mouse_events: 0;
272 description { state: "default" 0.0; 272 description { state: "default" 0.0;
273 rel1.to: "top"; 273 rel.to: "top";
274 rel2.to: "top";
275 visible: 0; 274 visible: 0;
276 } 275 }
277 description { state: "focused" 0.0; 276 description { state: "focused" 0.0;
@@ -282,10 +281,8 @@ group { name: "e/widgets/border/default/border";
282 part { name: "close1"; mouse_events: 0; 281 part { name: "close1"; mouse_events: 0;
283 description { state: "default" 0.0; 282 description { state: "default" 0.0;
284 image.normal: "border_close.png"; 283 image.normal: "border_close.png";
285 rel1.to: "e.event.close"; 284 rel.to: "e.event.close";
286 rel2.to: "e.event.close"; 285 min: 15 15; max: 15 15;
287 min: 15 15;
288 max: 15 15;
289 fixed: 1 1; 286 fixed: 1 1;
290 color: 160 160 160 255; 287 color: 160 160 160 255;
291 } 288 }
@@ -298,10 +295,8 @@ group { name: "e/widgets/border/default/border";
298 clip_to: "clip1"; 295 clip_to: "clip1";
299 description { state: "default" 0.0; 296 description { state: "default" 0.0;
300 image.normal: "border_maximize.png"; 297 image.normal: "border_maximize.png";
301 rel1.to: "e.event.maximize"; 298 rel.to: "e.event.maximize";
302 rel2.to: "e.event.maximize"; 299 min: 15 15; max: 15 15;
303 min: 15 15;
304 max: 15 15;
305 fixed: 1 1; 300 fixed: 1 1;
306 color: 160 160 160 255; 301 color: 160 160 160 255;
307 } 302 }
@@ -314,10 +309,8 @@ group { name: "e/widgets/border/default/border";
314 clip_to: "clip1"; 309 clip_to: "clip1";
315 description { state: "default" 0.0; 310 description { state: "default" 0.0;
316 image.normal: "border_minimize.png"; 311 image.normal: "border_minimize.png";
317 rel1.to: "e.event.minimize"; 312 rel.to: "e.event.minimize";
318 rel2.to: "e.event.minimize"; 313 min: 15 15; max: 15 15;
319 min: 15 15;
320 max: 15 15;
321 fixed: 1 1; 314 fixed: 1 1;
322 color: 160 160 160 255; 315 color: 160 160 160 255;
323 } 316 }
@@ -330,10 +323,8 @@ group { name: "e/widgets/border/default/border";
330 clip_to: "clip2"; 323 clip_to: "clip2";
331 description { state: "default" 0.0; 324 description { state: "default" 0.0;
332 image.normal: "border_close.png"; 325 image.normal: "border_close.png";
333 rel1.to: "e.event.close"; 326 rel.to: "e.event.close";
334 rel2.to: "e.event.close"; 327 min: 15 15; max: 15 15;
335 min: 15 15;
336 max: 15 15;
337 fixed: 1 1; 328 fixed: 1 1;
338 color: 255 255 255 255; 329 color: 255 255 255 255;
339 } 330 }
@@ -346,10 +337,8 @@ group { name: "e/widgets/border/default/border";
346 clip_to: "clip2"; 337 clip_to: "clip2";
347 description { state: "default" 0.0; 338 description { state: "default" 0.0;
348 image.normal: "border_maximize.png"; 339 image.normal: "border_maximize.png";
349 rel1.to: "e.event.maximize"; 340 rel.to: "e.event.maximize";
350 rel2.to: "e.event.maximize"; 341 min: 15 15; max: 15 15;
351 min: 15 15;
352 max: 15 15;
353 fixed: 1 1; 342 fixed: 1 1;
354 color: 255 255 255 255; 343 color: 255 255 255 255;
355 } 344 }
@@ -362,10 +351,8 @@ group { name: "e/widgets/border/default/border";
362 clip_to: "clip2"; 351 clip_to: "clip2";
363 description { state: "default" 0.0; 352 description { state: "default" 0.0;
364 image.normal: "border_minimize.png"; 353 image.normal: "border_minimize.png";
365 rel1.to: "e.event.minimize"; 354 rel.to: "e.event.minimize";
366 rel2.to: "e.event.minimize"; 355 min: 15 15; max: 15 15;
367 min: 15 15;
368 max: 15 15;
369 fixed: 1 1; 356 fixed: 1 1;
370 color: 255 255 255 255; 357 color: 255 255 255 255;
371 } 358 }
@@ -428,45 +415,57 @@ group { name: "e/widgets/border/default/border";
428 } 415 }
429 } 416 }
430 part { name: "e.event.resize.tl"; type: RECT; 417 part { name: "e.event.resize.tl"; type: RECT;
418 scale: 1;
431 description { state: "default" 0.0; 419 description { state: "default" 0.0;
432 fixed: 1 1; 420 rel.to: "top";
433 rel2.relative: 0.0 0.0; 421 rel2.relative: 0.0 0.0;
434 min: 32 4; 422 rel2.offset: 31 3;
435 align: 0.0 0.0; 423 min: 40 6;
424 align: 1.0 1.0;
436 color: 0 0 0 0; 425 color: 0 0 0 0;
426 fixed: 1 1;
427 offscale;
437 } 428 }
438 } 429 }
439 part { name: "e.event.resize.t"; type: RECT; 430 part { name: "e.event.resize.t"; type: RECT;
431 scale: 1;
440 description { state: "default" 0.0; 432 description { state: "default" 0.0;
441 fixed: 0 1;
442 rel1.relative: 1.0 0.0; 433 rel1.relative: 1.0 0.0;
443 rel1.to_x: "e.event.resize.tl"; 434 rel1.to: "e.event.resize.tl";
444 rel2.relative: 0.0 0.0; 435 rel2.relative: 0.0 1.0;
445 rel2.to_x: "e.event.resize.tr"; 436 rel2.to: "e.event.resize.tr";
446 min: 0 4; 437 min: 0 6;
447 align: 0.5 0.0; 438 align: 0.5 1.0;
448 color: 0 0 0 0; 439 color: 0 0 0 0;
440 fixed: 1 1;
449 } 441 }
450 } 442 }
451 part { name: "e.event.resize.tr"; type: RECT; 443 part { name: "e.event.resize.tr"; type: RECT;
444 scale: 1;
452 description { state: "default" 0.0; 445 description { state: "default" 0.0;
453 fixed: 1 1; 446 rel.to: "top";
454 rel1.relative: 1.0 0.0; 447 rel1.relative: 1.0 0.0;
448 rel1.offset: -32 0;
455 rel2.relative: 1.0 0.0; 449 rel2.relative: 1.0 0.0;
456 min: 32 4; 450 rel2.offset: -1 3;
457 align: 1.0 0.0; 451 min: 40 6;
452 align: 0.0 1.0;
458 color: 0 0 0 0; 453 color: 0 0 0 0;
454 fixed: 1 1;
455 offscale;
459 } 456 }
460 } 457 }
461 part { name: "bottom"; type: RECT; mouse_events: 0; 458 part { name: "bottom"; type: RECT; mouse_events: 0;
459 scale: 1;
462 description { state: "default" 0.0; 460 description { state: "default" 0.0;
463 color_class: "border_bottom"; 461 color_class: "border_bottom";
464 color: 64 64 64 255; 462 color: 64 64 64 255;
465 rel1.relative: 0.0 1.0; 463 rel1.relative: 0.0 1.0;
466 rel1.offset: 0 -5;
467 rel2.relative: 1.0 1.0; 464 rel2.relative: 1.0 1.0;
465 align: 0.5 1.0;
468 min: 0 5; 466 min: 0 5;
469 fixed: 0 1; 467 fixed: 0 1;
468 offscale;
470 } 469 }
471 description { state: "shaded" 0.0; 470 description { state: "shaded" 0.0;
472 inherit: "default" 0.0; 471 inherit: "default" 0.0;
@@ -480,15 +479,16 @@ group { name: "e/widgets/border/default/border";
480 } 479 }
481 } 480 }
482 part { name: "e.event.resize.bl"; type: RECT; 481 part { name: "e.event.resize.bl"; type: RECT;
482 scale: 1;
483 description { state: "default" 0.0; 483 description { state: "default" 0.0;
484 rel1.relative: 0.0 1.0; 484 rel.to: "bottom";
485 rel1.to_y: "e.swallow.client";
486 rel1.offset: 0 -1;
487 rel2.relative: 0.0 1.0; 485 rel2.relative: 0.0 1.0;
488 min: 32 5; 486 rel2.offset: 31 -1;
489 align: 0.0 1.0; 487 min: 40 10;
488 align: 0.0 0.5;
490 color: 0 0 0 0; 489 color: 0 0 0 0;
491 fixed: 1 1; 490 fixed: 1 1;
491 offscale;
492 } 492 }
493 description { state: "shaded" 0.0; 493 description { state: "shaded" 0.0;
494 inherit: "default" 0.0; 494 inherit: "default" 0.0;
@@ -502,16 +502,17 @@ group { name: "e/widgets/border/default/border";
502 } 502 }
503 } 503 }
504 part { name: "e.event.resize.b"; type: RECT; 504 part { name: "e.event.resize.b"; type: RECT;
505 scale: 1;
505 description { state: "default" 0.0; 506 description { state: "default" 0.0;
507 rel1.to: "e.event.resize.bl";
506 rel1.relative: 1.0 0.0; 508 rel1.relative: 1.0 0.0;
507 rel1.to_x: "e.event.resize.tl"; 509 rel2.to: "e.event.resize.br";
508 rel1.to_y: "bottom";
509 rel2.relative: 0.0 1.0; 510 rel2.relative: 0.0 1.0;
510 rel2.to_x: "e.event.resize.tr"; 511 min: 0 10;
511 min: 0 5; 512 align: 0.5 0.5;
512 align: 0.5 1.0;
513 color: 0 0 0 0; 513 color: 0 0 0 0;
514 fixed: 0 1; 514 fixed: 1 1;
515 offscale;
515 } 516 }
516 description { state: "shaded" 0.0; 517 description { state: "shaded" 0.0;
517 inherit: "default" 0.0; 518 inherit: "default" 0.0;
@@ -525,15 +526,16 @@ group { name: "e/widgets/border/default/border";
525 } 526 }
526 } 527 }
527 part { name: "e.event.resize.br"; type: RECT; 528 part { name: "e.event.resize.br"; type: RECT;
529 scale: 1;
528 description { state: "default" 0.0; 530 description { state: "default" 0.0;
529 rel1.relative: 1.0 1.0; 531 rel.to: "bottom";
530 rel1.to_y: "e.swallow.client"; 532 rel1.relative: 1.0 0.0;
531 rel1.offset: 0 -1; 533 rel1.offset: -32 0;
532 rel2.relative: 1.0 1.0; 534 min: 40 10;
533 min: 32 5; 535 align: 0.0 0.5;
534 align: 1.0 1.0;
535 color: 0 0 0 0; 536 color: 0 0 0 0;
536 fixed: 1 1; 537 fixed: 1 1;
538 offscale;
537 } 539 }
538 description { state: "shaded" 0.0; 540 description { state: "shaded" 0.0;
539 inherit: "default" 0.0; 541 inherit: "default" 0.0;
diff --git a/data/elementary/themes/edc/comp.edc b/data/elementary/themes/edc/comp.edc
index b5d21768da..5ab902f818 100644
--- a/data/elementary/themes/edc/comp.edc
+++ b/data/elementary/themes/edc/comp.edc
@@ -86,89 +86,69 @@ group { name: "e/comp/screen/overlay/default";
86 } 86 }
87 } 87 }
88 programs { 88 programs {
89 program { 89 program { signal: "e,state,screensaver,on"; source: "e";
90 name: "screensaver_on";
91 signal: "e,state,screensaver,on"; source: "e";
92 action: STATE_SET "visible" 0.0; 90 action: STATE_SET "visible" 0.0;
93 transition: ACCELERATE 3.0 CURRENT; 91 transition: ACCELERATE 3.0 USE_DURATION_FACTOR 1 CURRENT;
94 target: "blanker"; 92 target: "blanker";
95 sequence { 93 sequence {
96 action: SIGNAL_EMIT "e,state,screensaver,active" "e"; 94 action: SIGNAL_EMIT "e,state,screensaver,active" "e";
97 } 95 }
98 } 96 }
99 program { 97 program { signal: "e,state,screensaver,on"; source: "e";
100 name: "screensaver_on2";
101 signal: "e,state,screensaver,on"; source: "e";
102 action: STATE_SET "visible" 0.0; 98 action: STATE_SET "visible" 0.0;
103 transition: DECELERATE 3.0 CURRENT; 99 transition: DECELERATE 3.0 USE_DURATION_FACTOR 1 CURRENT;
104 target: "shadow"; 100 target: "shadow";
105 } 101 }
106 program { 102 program { signal: "e,state,screensaver,off"; source: "e";
107 name: "screensaver_off";
108 signal: "e,state,screensaver,off"; source: "e";
109 action: STATE_SET "default" 0.0; 103 action: STATE_SET "default" 0.0;
110 transition: ACCELERATE 0.5 CURRENT; 104 transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
111 target: "blanker"; 105 target: "blanker";
112 } 106 }
113 program { 107 program { signal: "e,state,screensaver,off"; source: "e";
114 name: "screensaver_off2";
115 signal: "e,state,screensaver,off"; source: "e";
116 action: STATE_SET "default" 0.0; 108 action: STATE_SET "default" 0.0;
117 transition: ACCELERATE 0.5 CURRENT; 109 transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
118 target: "shadow"; 110 target: "shadow";
119 } 111 }
120 program { 112 program { signal: "e,state,sys,suspend"; source: "e";
121 name: "suspend";
122 signal: "e,state,sys,suspend"; source: "e";
123 action: STATE_SET "visible" 0.0; 113 action: STATE_SET "visible" 0.0;
124 transition: ACCELERATE 0.5 CURRENT; 114 transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
125 target: "suspender"; 115 target: "suspender";
126 sequence { 116 sequence {
127 action: SIGNAL_EMIT "e,state,sys,suspend,done" "e"; 117 action: SIGNAL_EMIT "e,state,sys,suspend,done" "e";
128 } 118 }
129 } 119 }
130 program { 120 program { signal: "e,state,sys,hibernate"; source: "e";
131 name: "hibernate";
132 signal: "e,state,sys,hibernate"; source: "e";
133 action: STATE_SET "visible" 0.0; 121 action: STATE_SET "visible" 0.0;
134 transition: ACCELERATE 0.5 CURRENT; 122 transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
135 target: "suspender"; 123 target: "suspender";
136 sequence { 124 sequence {
137 action: SIGNAL_EMIT "e,state,sys,hibernate,done" "e"; 125 action: SIGNAL_EMIT "e,state,sys,hibernate,done" "e";
138 } 126 }
139 } 127 }
140 program { 128 program { signal: "e,state,sys,resume"; source: "e";
141 name: "resume";
142 signal: "e,state,sys,resume"; source: "e";
143 action: STATE_SET "default" 0.0; 129 action: STATE_SET "default" 0.0;
144 transition: DECELERATE 0.5 CURRENT; 130 transition: DECELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
145 target: "suspender"; 131 target: "suspender";
146 } 132 }
147 program { 133 program { signal: "e,state,sys,reboot"; source: "e";
148 name: "reboot";
149 signal: "e,state,sys,reboot"; source: "e";
150 action: STATE_SET "visible" 0.0; 134 action: STATE_SET "visible" 0.0;
151 transition: ACCELERATE 0.5 CURRENT; 135 transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
152 target: "suspender"; 136 target: "suspender";
153 sequence { 137 sequence {
154 action: SIGNAL_EMIT "e,state,sys,reboot,done" "e"; 138 action: SIGNAL_EMIT "e,state,sys,reboot,done" "e";
155 } 139 }
156 } 140 }
157 program { 141 program { signal: "e,state,sys,halt"; source: "e";
158 name: "halt";
159 signal: "e,state,sys,halt"; source: "e";
160 action: STATE_SET "visible" 0.0; 142 action: STATE_SET "visible" 0.0;
161 transition: ACCELERATE 0.5 CURRENT; 143 transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
162 target: "suspender"; 144 target: "suspender";
163 sequence { 145 sequence {
164 action: SIGNAL_EMIT "e,state,sys,halt,done" "e"; 146 action: SIGNAL_EMIT "e,state,sys,halt,done" "e";
165 } 147 }
166 } 148 }
167 program { 149 program { signal: "e,state,sys,logout"; source: "e";
168 name: "logout";
169 signal: "e,state,sys,logout"; source: "e";
170 action: STATE_SET "visible" 0.0; 150 action: STATE_SET "visible" 0.0;
171 transition: ACCELERATE 0.5 CURRENT; 151 transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
172 target: "suspender"; 152 target: "suspender";
173 sequence { 153 sequence {
174 action: SIGNAL_EMIT "e,state,sys,logout,done" "e"; 154 action: SIGNAL_EMIT "e,state,sys,logout,done" "e";
@@ -223,6 +203,7 @@ group { name: "e/comp/frame/default";
223 } 203 }
224 part { name: "shadow"; mouse_events: 0; 204 part { name: "shadow"; mouse_events: 0;
225 clip_to: "clipper"; 205 clip_to: "clipper";
206 scale: 1;
226 description { state: "default" 0.0; 207 description { state: "default" 0.0;
227 rel.to: "e.swallow.content"; 208 rel.to: "e.swallow.content";
228 WIN_SHADOW; 209 WIN_SHADOW;
@@ -271,18 +252,15 @@ group { name: "e/comp/frame/default";
271 } 252 }
272 } 253 }
273 programs { 254 programs {
274 program { 255 program { signal: "e,state,shadow,on"; source: "e";
275 signal: "e,state,shadow,on"; source: "e";
276 action: STATE_SET "default" 0.0; 256 action: STATE_SET "default" 0.0;
277 target: "shadow"; 257 target: "shadow";
278 } 258 }
279 program { 259 program { signal: "e,state,shadow,off"; source: "e";
280 signal: "e,state,shadow,off"; source: "e";
281 action: STATE_SET "hidden" 0.0; 260 action: STATE_SET "hidden" 0.0;
282 target: "shadow"; 261 target: "shadow";
283 } 262 }
284 program { 263 program { name: "visible_on";
285 name: "visible_on";
286 signal: "e,state,visible"; source: "e"; 264 signal: "e,state,visible"; source: "e";
287 action: STATE_SET "visible" 0.0; 265 action: STATE_SET "visible" 0.0;
288 transition: DECELERATE 0.15 USE_DURATION_FACTOR 1; 266 transition: DECELERATE 0.15 USE_DURATION_FACTOR 1;
@@ -291,18 +269,15 @@ group { name: "e/comp/frame/default";
291 action: SIGNAL_EMIT "e,action,show,done" "e"; 269 action: SIGNAL_EMIT "e,action,show,done" "e";
292 } 270 }
293 } 271 }
294 program { 272 program { signal: "e,state,visible"; source: "e";
295 signal: "e,state,visible"; source: "e";
296 action: ACTION_STOP; 273 action: ACTION_STOP;
297 target: "visible_off"; 274 target: "visible_off";
298 } 275 }
299 program { 276 program { signal: "e,state,hidden"; source: "e";
300 signal: "e,state,hidden"; source: "e";
301 action: ACTION_STOP; 277 action: ACTION_STOP;
302 target: "visible_on"; 278 target: "visible_on";
303 } 279 }
304 program { 280 program { name: "visible_off";
305 name: "visible_off";
306 signal: "e,state,hidden"; source: "e"; 281 signal: "e,state,hidden"; source: "e";
307 action: STATE_SET "default" 0.0; 282 action: STATE_SET "default" 0.0;
308 transition: DECELERATE 0.30 USE_DURATION_FACTOR 1; 283 transition: DECELERATE 0.30 USE_DURATION_FACTOR 1;
@@ -392,14 +367,12 @@ group { name: "e/comp/frame/rotate";
392 } 367 }
393 } 368 }
394 programs { 369 programs {
395 program { name: "focus3"; 370 program { signal: "e,state,focused"; source: "e";
396 signal: "e,state,focused"; source: "e";
397 action: STATE_SET "default" 0.0; 371 action: STATE_SET "default" 0.0;
398 target: "e.swallow.content"; 372 target: "e.swallow.content";
399 transition: LINEAR 0.3 USE_DURATION_FACTOR 1; 373 transition: LINEAR 0.3 USE_DURATION_FACTOR 1;
400 } 374 }
401 program { name: "focus_off3"; 375 program { signal: "e,state,unfocused"; source: "e";
402 signal: "e,state,unfocused"; source: "e";
403 action: STATE_SET "focus-out" 0.0; 376 action: STATE_SET "focus-out" 0.0;
404 target: "e.swallow.content"; 377 target: "e.swallow.content";
405 transition: LINEAR 0.3 USE_DURATION_FACTOR 1; 378 transition: LINEAR 0.3 USE_DURATION_FACTOR 1;
@@ -454,12 +427,10 @@ group { name: "e/comp/frame/none";
454 } 427 }
455 } 428 }
456 programs { 429 programs {
457 program { 430 program { signal: "e,state,visible"; source: "e";
458 signal: "e,state,visible"; source: "e";
459 action: SIGNAL_EMIT "e,action,show,done" "e"; 431 action: SIGNAL_EMIT "e,action,show,done" "e";
460 } 432 }
461 program { 433 program { signal: "e,state,hidden"; source: "e";
462 signal: "e,state,hidden"; source: "e";
463 action: SIGNAL_EMIT "e,action,hide,done" "e"; 434 action: SIGNAL_EMIT "e,action,hide,done" "e";
464 } 435 }
465 } 436 }
@@ -484,6 +455,7 @@ group { name: "e/comp/frame/menu";
484 images.image: "win_menu_shadow.png" COMP; 455 images.image: "win_menu_shadow.png" COMP;
485 parts { 456 parts {
486 part { name: "shadow"; 457 part { name: "shadow";
458 scale: 1;
487 description { state: "default" 0.0; 459 description { state: "default" 0.0;
488 WIN_MENU_SHADOW; 460 WIN_MENU_SHADOW;
489 } 461 }
@@ -618,15 +590,13 @@ group { name: "e/comp/frame/fullscreen";
618 } 590 }
619 } 591 }
620 programs { 592 programs {
621 program { 593 program { name: "visible_on";
622 name: "visible_on";
623 signal: "e,state,visible"; source: "e"; 594 signal: "e,state,visible"; source: "e";
624 action: STATE_SET "visible" 0.0; 595 action: STATE_SET "visible" 0.0;
625 transition: DECELERATE 0.25 USE_DURATION_FACTOR 1; 596 transition: DECELERATE 0.25 USE_DURATION_FACTOR 1;
626 targets: "scr_shadow" "scr_shade"; 597 targets: "scr_shadow" "scr_shade";
627 } 598 }
628 program { 599 program { name: "visible_on2";
629 name: "visible_on2";
630 signal: "e,state,visible"; source: "e"; 600 signal: "e,state,visible"; source: "e";
631 action: STATE_SET "visible1" 0.0; 601 action: STATE_SET "visible1" 0.0;
632 transition: DECELERATE 0.05 USE_DURATION_FACTOR 1; 602 transition: DECELERATE 0.05 USE_DURATION_FACTOR 1;
@@ -638,25 +608,21 @@ group { name: "e/comp/frame/fullscreen";
638 action: SIGNAL_EMIT "e,action,show,done" "e"; 608 action: SIGNAL_EMIT "e,action,show,done" "e";
639 } 609 }
640 } 610 }
641 program { 611 program { signal: "e,state,visible"; source: "e";
642 signal: "e,state,visible"; source: "e";
643 action: ACTION_STOP; 612 action: ACTION_STOP;
644 targets: "visible_off" "visible_off2"; 613 targets: "visible_off" "visible_off2";
645 } 614 }
646 program { 615 program { signal: "e,state,hidden"; source: "e";
647 signal: "e,state,hidden"; source: "e";
648 action: ACTION_STOP; 616 action: ACTION_STOP;
649 targets: "visible_on" "visible_on2"; 617 targets: "visible_on" "visible_on2";
650 } 618 }
651 program { 619 program { name: "visible_off";
652 name: "visible_off";
653 signal: "e,state,hidden"; source: "e"; 620 signal: "e,state,hidden"; source: "e";
654 action: STATE_SET "default" 0.0; 621 action: STATE_SET "default" 0.0;
655 transition: DECELERATE 0.25 USE_DURATION_FACTOR 1; 622 transition: DECELERATE 0.25 USE_DURATION_FACTOR 1;
656 targets: "scr_shadow" "scr_shade"; 623 targets: "scr_shadow" "scr_shade";
657 } 624 }
658 program { 625 program { name: "visible_off2";
659 name: "visible_off2";
660 signal: "e,state,hidden"; source: "e"; 626 signal: "e,state,hidden"; source: "e";
661 action: STATE_SET "visible1" 0.0; 627 action: STATE_SET "visible1" 0.0;
662 transition: DECELERATE 0.2 USE_DURATION_FACTOR 1; 628 transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
diff --git a/data/elementary/themes/edc/desklock.edc b/data/elementary/themes/edc/desklock.edc
index 30061aa077..de63eeb5fd 100644
--- a/data/elementary/themes/edc/desklock.edc
+++ b/data/elementary/themes/edc/desklock.edc
@@ -19,12 +19,12 @@ group { name: "e/desklock/background";
19 } 19 }
20 program { signal: "show"; source: ""; 20 program { signal: "show"; source: "";
21 action: STATE_SET "visible" 0.0; 21 action: STATE_SET "visible" 0.0;
22 transition: SINUSOIDAL 0.5; 22 transition: SINUSOIDAL 0.5 USE_DURATION_FACTOR 1;
23 target: "clip"; 23 target: "clip";
24 } 24 }
25 program { signal: "e,action,hide"; source: "e"; 25 program { signal: "e,action,hide"; source: "e";
26 action: STATE_SET "default" 0.0; 26 action: STATE_SET "default" 0.0;
27 transition: SINUSOIDAL 0.5; 27 transition: SINUSOIDAL 0.5 USE_DURATION_FACTOR 1;
28 target: "clip"; 28 target: "clip";
29 sequence { 29 sequence {
30 action: SIGNAL_EMIT "e,action,hide,done" "e"; 30 action: SIGNAL_EMIT "e,action,hide,done" "e";
@@ -195,26 +195,24 @@ group { name: "e/desklock/login_box";
195 target: "cursor"; 195 target: "cursor";
196 after: "cursor_show_timer"; 196 after: "cursor_show_timer";
197 } 197 }
198 program { name: "cursor_show_timer";
199 in: 0.4 0.0;
200 after: "cursor_hide";
201 }
198 program { name: "cursor_hide"; 202 program { name: "cursor_hide";
199 action: STATE_SET "default" 0.0; 203 action: STATE_SET "default" 0.0;
200 target: "cursor"; 204 target: "cursor";
201 after: "cursor_hide_timer"; 205 after: "cursor_hide_timer";
202 } 206 }
203 program { name: "cursor_show_timer";
204 in: 0.4 0.0;
205 after: "cursor_hide";
206 }
207 program { name: "cursor_hide_timer"; 207 program { name: "cursor_hide_timer";
208 in: 0.4 0.0; 208 in: 0.4 0.0;
209 after: "cursor_show"; 209 after: "cursor_show";
210 } 210 }
211 program { 211 program { signal: "e,state,selected"; source: "e";
212 signal: "e,state,selected"; source: "e";
213 action: STATE_SET "active" 0.0; 212 action: STATE_SET "active" 0.0;
214 target: "selection"; 213 target: "selection";
215 } 214 }
216 program { 215 program { signal: "e,state,unselected"; source: "e";
217 signal: "e,state,unselected"; source: "e";
218 action: STATE_SET "default" 0.0; 216 action: STATE_SET "default" 0.0;
219 target: "selection"; 217 target: "selection";
220 } 218 }
@@ -316,27 +314,25 @@ group { name: "e/desklock/pin_box";
316 target: "cursor"; 314 target: "cursor";
317 after: "cursor_show_timer"; 315 after: "cursor_show_timer";
318 } 316 }
317 program { name: "cursor_show_timer";
318 in: 0.5 0.0;
319 after: "cursor_hide";
320 }
319 program { name: "cursor_hide"; 321 program { name: "cursor_hide";
320 action: STATE_SET "default" 0.0; 322 action: STATE_SET "default" 0.0;
321 target: "cursor"; 323 target: "cursor";
322 transition: SINUSOIDAL 0.2; 324 transition: SINUSOIDAL 0.2 USE_DURATION_FACTOR 1;
323 after: "cursor_hide_timer"; 325 after: "cursor_hide_timer";
324 } 326 }
325 program { name: "cursor_show_timer";
326 in: 0.5 0.0;
327 after: "cursor_hide";
328 }
329 program { name: "cursor_hide_timer"; 327 program { name: "cursor_hide_timer";
330 in: 0.2 0.0; 328 in: 0.2 0.0;
331 after: "cursor_show"; 329 after: "cursor_show";
332 } 330 }
333 program { 331 program { signal: "e,state,selected"; source: "e";
334 signal: "e,state,selected"; source: "e";
335 action: STATE_SET "active" 0.0; 332 action: STATE_SET "active" 0.0;
336 target: "selection"; 333 target: "selection";
337 } 334 }
338 program { 335 program { signal: "e,state,unselected"; source: "e";
339 signal: "e,state,unselected"; source: "e";
340 action: STATE_SET "default" 0.0; 336 action: STATE_SET "default" 0.0;
341 target: "selection"; 337 target: "selection";
342 } 338 }
diff --git a/data/elementary/themes/edc/elm/border.edc b/data/elementary/themes/edc/elm/border.edc
index aec91c66bb..579eb79b0b 100644
--- a/data/elementary/themes/edc/elm/border.edc
+++ b/data/elementary/themes/edc/elm/border.edc
@@ -39,6 +39,7 @@ group { name: "elm/border/base/default";
39 } 39 }
40 /* shadow spacer and clipper */ 40 /* shadow spacer and clipper */
41 spacer { "shadow_spacer"; 41 spacer { "shadow_spacer";
42 scale: 1;
42 desc { "default"; 43 desc { "default";
43 WIN_SHADOW_SPACER; 44 WIN_SHADOW_SPACER;
44 } 45 }
@@ -48,6 +49,7 @@ group { name: "elm/border/base/default";
48 } 49 }
49 } 50 }
50 image { "shadow"; nomouse; 51 image { "shadow"; nomouse;
52 scale: 1;
51 desc { "default"; 53 desc { "default";
52 rel.to: "shadow_spacer"; 54 rel.to: "shadow_spacer";
53 WIN_SHADOW; 55 WIN_SHADOW;
@@ -160,12 +162,14 @@ group { name: "elm/border/base/default";
160 162
161 /* top title bar - spacer and clipper */ 163 /* top title bar - spacer and clipper */
162 rect { "top_clip"; //nomouse; 164 rect { "top_clip"; //nomouse;
165// scale: 1;
163 desc { "default"; 166 desc { "default";
164 rel1.to: "shadow_spacer"; 167 rel1.to: "shadow_spacer";
165 rel2.to_y: "elm.text.title"; 168 rel2.to_y: "elm.text.title";
166 rel2.to_x: "shadow_spacer"; 169 rel2.to_x: "shadow_spacer";
167 rel2.offset: -1 3; 170 rel2.offset: -1 3;
168 vis; 171 vis;
172// offscale;
169 } 173 }
170 desc { "hidden"; 174 desc { "hidden";
171 inherit: "default"; 175 inherit: "default";
@@ -214,6 +218,7 @@ group { name: "elm/border/base/default";
214 min: 0 1; 218 min: 0 1;
215 } 219 }
216 fixed: 0 1; 220 fixed: 0 1;
221// offscale;
217 } 222 }
218 description { state: "focused" 0.0; 223 description { state: "focused" 0.0;
219 inherit: "default" 0.0; 224 inherit: "default" 0.0;
@@ -222,8 +227,7 @@ group { name: "elm/border/base/default";
222 } 227 }
223 spacer { "icon"; 228 spacer { "icon";
224 desc { "default"; 229 desc { "default";
225 rel1.to: "elm.event.icon"; 230 rel.to: "elm.event.icon";
226 rel2.to: "elm.event.icon";
227 } 231 }
228 desc { "bounce1"; 232 desc { "bounce1";
229 inherit: "default"; 233 inherit: "default";
@@ -278,8 +282,7 @@ group { name: "elm/border/base/default";
278 clip: "busy_clip"; 282 clip: "busy_clip";
279 desc { "default"; 283 desc { "default";
280 fixed: 1 1; 284 fixed: 1 1;
281 rel1.to: "knob"; 285 rel.to: "knob";
282 rel2.to: "knob";
283 image.normal: "glow_round_corners_small.png"; 286 image.normal: "glow_round_corners_small.png";
284 map.on: 1; 287 map.on: 1;
285 map.smooth: 1; 288 map.smooth: 1;
@@ -292,8 +295,7 @@ group { name: "elm/border/base/default";
292 } 295 }
293 rect { "clip1"; nomouse; 296 rect { "clip1"; nomouse;
294 desc { "default"; 297 desc { "default";
295 rel1.to: "top_clip"; 298 rel.to: "top_clip";
296 rel2.to: "top_clip";
297 } 299 }
298 desc { "focused"; 300 desc { "focused";
299 inherit: "default"; 301 inherit: "default";
@@ -302,8 +304,7 @@ group { name: "elm/border/base/default";
302 } 304 }
303 rect { "clip2"; nomouse; 305 rect { "clip2"; nomouse;
304 desc { "default"; 306 desc { "default";
305 rel1.to: "top_clip"; 307 rel.to: "top_clip";
306 rel2.to: "top_clip";
307 visible: 0; 308 visible: 0;
308 } 309 }
309 desc { "focused"; 310 desc { "focused";
@@ -315,10 +316,8 @@ group { name: "elm/border/base/default";
315 clip: "clip1"; 316 clip: "clip1";
316 desc { "default"; 317 desc { "default";
317 image.normal: "border_close.png"; 318 image.normal: "border_close.png";
318 rel1.to: "elm.event.close"; 319 rel.to: "elm.event.close";
319 rel2.to: "elm.event.close"; 320 min: 15 15; max: 15 15;
320 min: 15 15;
321 max: 15 15;
322 fixed: 1 1; 321 fixed: 1 1;
323 color: 160 160 160 255; 322 color: 160 160 160 255;
324 } 323 }
@@ -331,10 +330,8 @@ group { name: "elm/border/base/default";
331 clip: "clip1"; 330 clip: "clip1";
332 desc { "default"; 331 desc { "default";
333 image.normal: "border_maximize.png"; 332 image.normal: "border_maximize.png";
334 rel1.to: "elm.event.maximize"; 333 rel.to: "elm.event.maximize";
335 rel2.to: "elm.event.maximize"; 334 min: 15 15; max: 15 15;
336 min: 15 15;
337 max: 15 15;
338 fixed: 1 1; 335 fixed: 1 1;
339 color: 160 160 160 255; 336 color: 160 160 160 255;
340 } 337 }
@@ -347,10 +344,8 @@ group { name: "elm/border/base/default";
347 clip: "clip1"; 344 clip: "clip1";
348 desc { "default"; 345 desc { "default";
349 image.normal: "border_minimize.png"; 346 image.normal: "border_minimize.png";
350 rel1.to: "elm.event.minimize"; 347 rel.to: "elm.event.minimize";
351 rel2.to: "elm.event.minimize"; 348 min: 15 15; max: 15 15;
352 min: 15 15;
353 max: 15 15;
354 fixed: 1 1; 349 fixed: 1 1;
355 color: 160 160 160 255; 350 color: 160 160 160 255;
356 } 351 }
@@ -363,10 +358,8 @@ group { name: "elm/border/base/default";
363 clip: "clip2"; 358 clip: "clip2";
364 desc { "default"; 359 desc { "default";
365 image.normal: "border_close.png"; 360 image.normal: "border_close.png";
366 rel1.to: "elm.event.close"; 361 rel.to: "elm.event.close";
367 rel2.to: "elm.event.close"; 362 min: 15 15; max: 15 15;
368 min: 15 15;
369 max: 15 15;
370 fixed: 1 1; 363 fixed: 1 1;
371 color: 160 160 160 255; 364 color: 160 160 160 255;
372 } 365 }
@@ -379,10 +372,8 @@ group { name: "elm/border/base/default";
379 clip: "clip2"; 372 clip: "clip2";
380 desc { "default"; 373 desc { "default";
381 image.normal: "border_maximize.png"; 374 image.normal: "border_maximize.png";
382 rel1.to: "elm.event.maximize"; 375 rel.to: "elm.event.maximize";
383 rel2.to: "elm.event.maximize"; 376 min: 15 15; max: 15 15;
384 min: 15 15;
385 max: 15 15;
386 fixed: 1 1; 377 fixed: 1 1;
387 color: 160 160 160 255; 378 color: 160 160 160 255;
388 } 379 }
@@ -395,10 +386,8 @@ group { name: "elm/border/base/default";
395 clip: "clip2"; 386 clip: "clip2";
396 desc { "default"; 387 desc { "default";
397 image.normal: "border_minimize.png"; 388 image.normal: "border_minimize.png";
398 rel1.to: "elm.event.minimize"; 389 rel.to: "elm.event.minimize";
399 rel2.to: "elm.event.minimize"; 390 min: 15 15; max: 15 15;
400 min: 15 15;
401 max: 15 15;
402 fixed: 1 1; 391 fixed: 1 1;
403 color: 160 160 160 255; 392 color: 160 160 160 255;
404 } 393 }
@@ -480,11 +469,13 @@ group { name: "elm/border/base/default";
480 } 469 }
481 rect { "elm.event.resize.tl"; 470 rect { "elm.event.resize.tl";
482 clip: "top_resize_clip"; 471 clip: "top_resize_clip";
472 scale: 1;
483 desc { "default"; 473 desc { "default";
484 rel.to: "top_clip"; 474 rel.to: "top_clip";
485 rel2.relative: 0.0 0.0; 475 rel2.relative: 0.0 0.0;
486 min: 32 4; 476 rel2.offset: 31 3;
487 align: 0.0 0.0; 477 min: 40 6;
478 align: 1.0 1.0;
488 color: 0 0 0 0; 479 color: 0 0 0 0;
489 fixed: 1 1; 480 fixed: 1 1;
490 } 481 }
@@ -492,15 +483,14 @@ group { name: "elm/border/base/default";
492 } 483 }
493 rect { "elm.event.resize.t"; 484 rect { "elm.event.resize.t";
494 clip: "top_resize_clip"; 485 clip: "top_resize_clip";
486 scale: 1;
495 desc { "default"; 487 desc { "default";
488 rel1.to: "elm.event.resize.tl";
496 rel1.relative: 1.0 0.0; 489 rel1.relative: 1.0 0.0;
497 rel1.to_y: "top_clip"; 490 rel2.to: "elm.event.resize.tr";
498 rel1.to_x: "elm.event.resize.tl"; 491 rel2.relative: 0.0 1.0;
499 rel2.relative: 0.0 0.0; 492 min: 0 6;
500 rel2.to_x: "elm.event.resize.tr"; 493 align: 0.5 1.0;
501 rel2.to_y: "top_clip";
502 min: 0 4;
503 align: 0.5 0.0;
504 color: 0 0 0 0; 494 color: 0 0 0 0;
505 fixed: 1 1; 495 fixed: 1 1;
506 } 496 }
@@ -508,12 +498,15 @@ group { name: "elm/border/base/default";
508 } 498 }
509 rect { "elm.event.resize.tr"; 499 rect { "elm.event.resize.tr";
510 clip: "top_resize_clip"; 500 clip: "top_resize_clip";
501 scale: 1;
511 desc { "default"; 502 desc { "default";
512 rel.to: "top_clip"; 503 rel.to: "top_clip";
513 rel1.relative: 1.0 0.0; 504 rel1.relative: 1.0 0.0;
505 rel1.offset: -32 0;
514 rel2.relative: 1.0 0.0; 506 rel2.relative: 1.0 0.0;
515 min: 32 4; 507 rel2.offset: -1 3;
516 align: 1.0 0.0; 508 min: 40 6;
509 align: 0.0 1.0;
517 color: 0 0 0 0; 510 color: 0 0 0 0;
518 fixed: 1 1; 511 fixed: 1 1;
519 } 512 }
@@ -529,6 +522,7 @@ group { name: "elm/border/base/default";
529 } 522 }
530 } 523 }
531 rect { "bottom_clip"; 524 rect { "bottom_clip";
525 scale: 1;
532 desc { "default"; 526 desc { "default";
533 rel.to: "shadow_spacer"; 527 rel.to: "shadow_spacer";
534 rel1 { relative: 0.0 1.0; offset: 0 -5; } 528 rel1 { relative: 0.0 1.0; offset: 0 -5; }
@@ -549,48 +543,50 @@ group { name: "elm/border/base/default";
549 rel.to: "bottom_clip"; 543 rel.to: "bottom_clip";
550 } 544 }
551 } 545 }
546
552 rect { "elm.event.resize.bl"; 547 rect { "elm.event.resize.bl";
553 clip: "bottom_clip"; 548 clip: "bottom_clip";
549 scale: 1;
554 desc { "default"; 550 desc { "default";
555 rel1.relative: 0.0 1.0; 551 rel.to: "bottom_clip";
556 rel1.to: "bottom_clip";
557 rel2.relative: 0.0 1.0; 552 rel2.relative: 0.0 1.0;
558 rel2.to: "bottom_clip"; 553 rel2.offset: 31 -1;
559 min: 32 5; 554 min: 40 10;
560 align: 0.0 1.0; 555 align: 0.0 0.5;
561 color: 0 0 0 0; 556 color: 0 0 0 0;
562 fixed: 1 1; 557 fixed: 1 1;
558 offscale;
563 } 559 }
564 desc { "hidden"; inherit: "default"; hid; } 560 desc { "hidden"; inherit: "default"; hid; }
565 } 561 }
566 rect { "elm.event.resize.b"; 562 rect { "elm.event.resize.b";
567 clip: "bottom_clip"; 563 clip: "bottom_clip";
564 scale: 1;
568 desc { "default"; 565 desc { "default";
569 rel1.relative: 1.0 1.0; 566 rel1.to: "elm.event.resize.bl";
570 rel1.to_x: "elm.event.resize.tl"; 567 rel1.relative: 1.0 0.0;
571 rel1.to_y: "bottom_clip"; 568 rel2.to: "elm.event.resize.br";
572 rel1.offset: 0 -1;
573 rel2.relative: 0.0 1.0; 569 rel2.relative: 0.0 1.0;
574 rel2.to_x: "elm.event.resize.tr"; 570 min: 0 10;
575 rel2.to_y: "bottom_clip"; 571 align: 0.5 0.5;
576 min: 0 5;
577 align: 0.5 1.0;
578 color: 0 0 0 0; 572 color: 0 0 0 0;
579 fixed: 0 1; 573 fixed: 1 1;
574 offscale;
580 } 575 }
581 desc { "hidden"; inherit: "default"; hid; } 576 desc { "hidden"; inherit: "default"; hid; }
582 } 577 }
583 rect { "elm.event.resize.br"; 578 rect { "elm.event.resize.br";
584 clip: "bottom_clip"; 579 clip: "bottom_clip";
580 scale: 1;
585 desc { "default"; 581 desc { "default";
586 rel1.relative: 1.0 1.0; 582 rel.to: "bottom_clip";
587 rel1.to: "bottom_clip"; 583 rel1.relative: 1.0 0.0;
588 rel2.relative: 1.0 1.0; 584 rel1.offset: -32 0;
589 rel2.to: "bottom_clip"; 585 min: 40 10;
590 min: 32 5; 586 align: 0.0 0.5;
591 align: 1.0 1.0;
592 color: 0 0 0 0; 587 color: 0 0 0 0;
593 fixed: 1 1; 588 fixed: 1 1;
589 offscale;
594 } 590 }
595 desc { "hidden"; inherit: "default"; hid; } 591 desc { "hidden"; inherit: "default"; hid; }
596 } 592 }
diff --git a/data/elementary/themes/macros.edc b/data/elementary/themes/macros.edc
index 2da66d46df..878b69dd2c 100644
--- a/data/elementary/themes/macros.edc
+++ b/data/elementary/themes/macros.edc
@@ -28,14 +28,17 @@
28 28
29#define WIN_SHADOW \ 29#define WIN_SHADOW \
30 image.normal: "win_shadow.png"; \ 30 image.normal: "win_shadow.png"; \
31 image.border: 44 44 44 44; \ 31 image.border: 32 32 32 32; \
32 image.border_scale: 1; \
33 image.border_scale_by: 1.0; \
32 image.middle: 0; \ 34 image.middle: 0; \
33 rel1.offset: -21 -14; \ 35 rel1.offset: -21 -14; \
34 rel2.offset: 20 27; \ 36 rel2.offset: 20 27; \
35 fill.smooth: 0 37 fill.smooth: 0; \
38 offscale
36#define WIN_SHADOW_SMALL \ 39#define WIN_SHADOW_SMALL \
37 image.normal: "win_shadow.png"; \ 40 image.normal: "win_shadow.png"; \
38 image.border: 44 44 44 44; \ 41 image.border: 32 32 32 32; \
39 image.border_scale: 1; \ 42 image.border_scale: 1; \
40 image.border_scale_by: 0.5; \ 43 image.border_scale_by: 0.5; \
41 image.middle: 0; \ 44 image.middle: 0; \
@@ -45,18 +48,21 @@
45 offscale 48 offscale
46#define WIN_SHADOW_SPACER \ 49#define WIN_SHADOW_SPACER \
47 rel1.offset: 21 14; \ 50 rel1.offset: 21 14; \
48 rel2.offset: -21 -28 51 rel2.offset: -21 -28; \
52 offscale
49#define WIN_MENU_SHADOW \ 53#define WIN_MENU_SHADOW \
50 image.normal: "win_menu_shadow.png"; \ 54 image.normal: "win_menu_shadow.png"; \
51 image.border: 44 44 16 29; \ 55 image.border: 32 32 32 32; \
56 image.border_scale: 1; \
57 image.border_scale_by: 1.0; \
52 image.middle: 0; \ 58 image.middle: 0; \
53 rel1.offset: -21 -14; \ 59 rel1.offset: -21 -14; \
54 rel2.offset: 20 27; \ 60 rel2.offset: 20 27; \
55 fill.smooth: 0 61 fill.smooth: 0; \
56 62 offscale
57#define WIN_SHADOW_ANGLE_SMALL(_img) \ 63#define WIN_SHADOW_ANGLE_SMALL(_img) \
58 image.normal: _img; \ 64 image.normal: _img; \
59 image.border: 22 22 16 30; \ 65 image.border: 32 32 32 32; \
60 image.border_scale: 1; \ 66 image.border_scale: 1; \
61 image.border_scale_by: 0.5; \ 67 image.border_scale_by: 0.5; \
62 image.middle: 0; \ 68 image.middle: 0; \