summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorMike Blumenkrantz <m.blumenkran@samsung.com>2013-02-25 14:04:12 +0000
committerMike Blumenkrantz <m.blumenkran@samsung.com>2013-04-15 08:39:16 +0100
commit505cec1d91dde9f8bb5e3e4ebe6c0b0942183486 (patch)
tree61913d10c07c978c59de9e402f3ce766680c9b33 /data
parentb919573644acc25dfc07a07a58213758d90e4671 (diff)
giant comp rejiggering commit #5:
* border frame/object now drawn directly on compositor canvas * border shadows now in border theme with edje hint, non-updated themes still receive comp object shadows FOR NOW * e_border MOVE/RESIZE pointer mode defines are now e_pointer.h enums * added BD_CHANGED() util macro for setting bd->changed and printing a debug line to assist in finding places where this all-important flag is wrongly set * bd->bg_win removed entirely * bd->pointer objects moved to compositor object; now only one pointer object exists for each compositor * resizing windows now shows a new and totally-intended scaling effect for window contents * some additional retooling of border deletion/free callbacks * fixed lurking potential bug where window could recieve focus from autoraise timer after border had been deleted * more comp shape improvements/rewrites * desk transitions are now BROKEN(ish) * various modules updated to not be totally broken with these changes
Diffstat (limited to 'data')
-rw-r--r--data/themes/edc/border.edc63
1 files changed, 49 insertions, 14 deletions
diff --git a/data/themes/edc/border.edc b/data/themes/edc/border.edc
index 28f5d4181..d445a47bf 100644
--- a/data/themes/edc/border.edc
+++ b/data/themes/edc/border.edc
@@ -19,6 +19,8 @@ group { name: "e/widgets/border/default/border";
19 images.image: "sym_up_light_selected.png" COMP; 19 images.image: "sym_up_light_selected.png" COMP;
20 images.image: "glow_round_corners_small.png" COMP; 20 images.image: "glow_round_corners_small.png" COMP;
21 images.image: "knob_round_small_busy.png" COMP; 21 images.image: "knob_round_small_busy.png" COMP;
22 images.image: "screen_circular_shadow.png" COMP;
23 data.item: "shadow" "1";
22 parts { 24 parts {
23 part { name: "client_clip"; type: RECT; 25 part { name: "client_clip"; type: RECT;
24 description { state: "default" 0.0; 26 description { state: "default" 0.0;
@@ -71,7 +73,7 @@ group { name: "e/widgets/border/default/border";
71 fill.smooth: 0; 73 fill.smooth: 0;
72 } 74 }
73 } 75 }
74 part { name: "e.text.title"; type: TEXT; 76 part { name: "e.text.title"; type: TEXT; mouse_events: 0;
75 scale: 1; 77 scale: 1;
76 effect: SHADOW BOTTOM; 78 effect: SHADOW BOTTOM;
77 description { state: "default" 0.0; 79 description { state: "default" 0.0;
@@ -97,7 +99,7 @@ group { name: "e/widgets/border/default/border";
97 visible: 0; 99 visible: 0;
98 } 100 }
99 } 101 }
100 part { name: "title2"; type: TEXT; 102 part { name: "title2"; type: TEXT; mouse_events: 0;
101 scale: 1; 103 scale: 1;
102 effect: SOFT_SHADOW BOTTOM; 104 effect: SOFT_SHADOW BOTTOM;
103 description { state: "default" 0.0; 105 description { state: "default" 0.0;
@@ -141,7 +143,7 @@ group { name: "e/widgets/border/default/border";
141 rel2.relative: 1.0 0.85; 143 rel2.relative: 1.0 0.85;
142 } 144 }
143 } 145 }
144 part { name: "e.swallow.icon"; type: SWALLOW; 146 part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
145 description { state: "default" 0.0; 147 description { state: "default" 0.0;
146 rel1.to: "icon"; 148 rel1.to: "icon";
147 rel1.relative: 0.15 0.15; 149 rel1.relative: 0.15 0.15;
@@ -150,7 +152,7 @@ group { name: "e/widgets/border/default/border";
150 rel2.offset: 0 0; 152 rel2.offset: 0 0;
151 } 153 }
152 } 154 }
153 part { name: "busy_clip"; type: RECT; 155 part { name: "busy_clip"; type: RECT; mouse_events: 0;
154 description { state: "default" 0.0; 156 description { state: "default" 0.0;
155 color: 255 255 255 0; 157 color: 255 255 255 0;
156 visible: 0; 158 visible: 0;
@@ -194,7 +196,7 @@ group { name: "e/widgets/border/default/border";
194 map.rotation.z: 360; 196 map.rotation.z: 360;
195 } 197 }
196 } 198 }
197 part { name: "clip1"; type: RECT; 199 part { name: "clip1"; type: RECT; mouse_events: 0;
198 description { state: "default" 0.0; 200 description { state: "default" 0.0;
199 rel1.to: "top"; 201 rel1.to: "top";
200 rel2.to: "top"; 202 rel2.to: "top";
@@ -204,7 +206,7 @@ group { name: "e/widgets/border/default/border";
204 visible: 0; 206 visible: 0;
205 } 207 }
206 } 208 }
207 part { name: "clip2"; type: RECT; 209 part { name: "clip2"; type: RECT; mouse_events: 0;
208 description { state: "default" 0.0; 210 description { state: "default" 0.0;
209 rel1.to: "top"; 211 rel1.to: "top";
210 rel2.to: "top"; 212 rel2.to: "top";
@@ -215,7 +217,7 @@ group { name: "e/widgets/border/default/border";
215 visible: 1; 217 visible: 1;
216 } 218 }
217 } 219 }
218 part { name: "close1"; 220 part { name: "close1"; mouse_events: 0;
219 clip_to: "clip1"; 221 clip_to: "clip1";
220 description { state: "default" 0.0; 222 description { state: "default" 0.0;
221 image.normal: "sym_close_dark_normal.png"; 223 image.normal: "sym_close_dark_normal.png";
@@ -230,7 +232,7 @@ group { name: "e/widgets/border/default/border";
230 image.normal: "sym_close_dark_selected.png"; 232 image.normal: "sym_close_dark_selected.png";
231 } 233 }
232 } 234 }
233 part { name: "max1"; 235 part { name: "max1"; mouse_events: 0;
234 clip_to: "clip1"; 236 clip_to: "clip1";
235 description { state: "default" 0.0; 237 description { state: "default" 0.0;
236 image.normal: "sym_up_dark_normal.png"; 238 image.normal: "sym_up_dark_normal.png";
@@ -245,7 +247,7 @@ group { name: "e/widgets/border/default/border";
245 image.normal: "sym_up_dark_selected.png"; 247 image.normal: "sym_up_dark_selected.png";
246 } 248 }
247 } 249 }
248 part { name: "min1"; 250 part { name: "min1"; mouse_events: 0;
249 clip_to: "clip1"; 251 clip_to: "clip1";
250 description { state: "default" 0.0; 252 description { state: "default" 0.0;
251 image.normal: "sym_down_dark_normal.png"; 253 image.normal: "sym_down_dark_normal.png";
@@ -260,7 +262,7 @@ group { name: "e/widgets/border/default/border";
260 image.normal: "sym_down_dark_selected.png"; 262 image.normal: "sym_down_dark_selected.png";
261 } 263 }
262 } 264 }
263 part { name: "close2"; 265 part { name: "close2"; mouse_events: 0;
264 clip_to: "clip2"; 266 clip_to: "clip2";
265 description { state: "default" 0.0; 267 description { state: "default" 0.0;
266 image.normal: "sym_close_light_normal.png"; 268 image.normal: "sym_close_light_normal.png";
@@ -275,7 +277,7 @@ group { name: "e/widgets/border/default/border";
275 image.normal: "sym_close_light_selected.png"; 277 image.normal: "sym_close_light_selected.png";
276 } 278 }
277 } 279 }
278 part { name: "max2"; 280 part { name: "max2"; mouse_events: 0;
279 clip_to: "clip2"; 281 clip_to: "clip2";
280 description { state: "default" 0.0; 282 description { state: "default" 0.0;
281 image.normal: "sym_up_light_normal.png"; 283 image.normal: "sym_up_light_normal.png";
@@ -290,7 +292,7 @@ group { name: "e/widgets/border/default/border";
290 image.normal: "sym_up_light_selected.png"; 292 image.normal: "sym_up_light_selected.png";
291 } 293 }
292 } 294 }
293 part { name: "min2"; 295 part { name: "min2"; mouse_events: 0;
294 clip_to: "clip2"; 296 clip_to: "clip2";
295 description { state: "default" 0.0; 297 description { state: "default" 0.0;
296 image.normal: "sym_down_light_normal.png"; 298 image.normal: "sym_down_light_normal.png";
@@ -389,7 +391,7 @@ group { name: "e/widgets/border/default/border";
389 color: 0 0 0 0; 391 color: 0 0 0 0;
390 } 392 }
391 } 393 }
392 part { name: "bottom"; type: RECT; 394 part { name: "bottom"; type: RECT; mouse_events: 0;
393 description { state: "default" 0.0; 395 description { state: "default" 0.0;
394 color_class: "border_bottom"; 396 color_class: "border_bottom";
395 rel1.relative: 0.0 1.0; 397 rel1.relative: 0.0 1.0;
@@ -410,7 +412,7 @@ group { name: "e/widgets/border/default/border";
410 visible: 0; 412 visible: 0;
411 } 413 }
412 } 414 }
413 part { name: "bevel2"; 415 part { name: "bevel2"; mouse_events: 0;
414 description { state: "default" 0.0; 416 description { state: "default" 0.0;
415 image.normal: "bevel_dark_out.png"; 417 image.normal: "bevel_dark_out.png";
416 image.border: 1 1 1 1; 418 image.border: 1 1 1 1;
@@ -428,6 +430,24 @@ group { name: "e/widgets/border/default/border";
428 visible: 0; 430 visible: 0;
429 } 431 }
430 } 432 }
433 part { name: "shadow";
434 mouse_events: 0;
435 description { state: "default" 0.0;
436 image.normal: "win_shadow.png";
437 image.border: 14 14 14 14;
438 image.middle: 0;
439 rel1.relative: 0.0 1.0;
440 rel1.to: "top";
441 rel1.offset: -7 -3;
442 rel2.to: "bottom";
443 rel2.offset: 6 11;
444 fill.smooth: 0;
445 }
446 description { state: "hidden" 0.0;
447 inherit: "default" 0.0;
448 visible: 0;
449 }
450 }
431 part { name: "e.event.resize.bl"; type: RECT; 451 part { name: "e.event.resize.bl"; type: RECT;
432 description { state: "default" 0.0; 452 description { state: "default" 0.0;
433 rel1.relative: 0.0 1.0; 453 rel1.relative: 0.0 1.0;
@@ -501,9 +521,24 @@ group { name: "e/widgets/border/default/border";
501 FIXED_SIZE(69, 5) 521 FIXED_SIZE(69, 5)
502 } 522 }
503 } 523 }
524 part { name: "events"; type: RECT; repeat_events: 1;
525 description { state: "default";
526 color: 0 0 0 0;
527 }
528 }
504 } 529 }
505 programs { 530 programs {
506 program { 531 program {
532 signal: "e,state,shadow,on"; source: "e";
533 action: STATE_SET "default" 0.0;
534 target: "shadow";
535 }
536 program {
537 signal: "e,state,shadow,off"; source: "e";
538 action: STATE_SET "hidden" 0.0;
539 target: "shadow";
540 }
541 program {
507 signal: "e,state,focused"; source: "e"; 542 signal: "e,state,focused"; source: "e";
508 action: STATE_SET "focused" 0.0; 543 action: STATE_SET "focused" 0.0;
509 target: "top"; 544 target: "top";