summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2014-01-29 13:30:05 -0500
committerMike Blumenkrantz <zmike@samsung.com>2014-01-29 13:36:52 -0500
commit6833a131c8657545dacf6384b183625dde2656bf (patch)
treed26c9877d6987d3ea5ad726b9c232ea615cd549a
parent26c04b0cbb08432bece85cfa82a67e3881de7fdc (diff)
remove e comp iconify theme hacks, add basic iconify effect
-rw-r--r--data/themes/edc/comp.edc99
-rw-r--r--data/themes/edc/comp_effects.edc78
2 files changed, 78 insertions, 99 deletions
diff --git a/data/themes/edc/comp.edc b/data/themes/edc/comp.edc
index f9bbcadc0..752cdc096 100644
--- a/data/themes/edc/comp.edc
+++ b/data/themes/edc/comp.edc
@@ -247,34 +247,7 @@ group { name: "e/comp/screen/overlay/noeffects";
247 247
248group { name: "e/comp/frame/default"; 248group { name: "e/comp/frame/default";
249 images.image: "win_glow.png" COMP; 249 images.image: "win_glow.png" COMP;
250 script {
251 public iconifying;
252 public uniconifying;
253
254 public message(Msg_Type:type, id, ...) {
255 // relative to obj x/y/w/h for src/dst of iconify
256 if ((type == MSG_INT_SET) && (id == 10)) {
257 new x, y, w, h;
258 x = getarg(2);
259 y = getarg(3);
260 w = getarg(4);
261 h = getarg(5);
262 custom_state(PART:"iconify-src", "default", 0.0);
263 set_state_val(PART:"iconify-src", STATE_REL1, 0.0, 0.0);
264 set_state_val(PART:"iconify-src", STATE_REL2, 0.0, 0.0);
265 set_state_val(PART:"iconify-src", STATE_REL1_OFFSET, x, y);
266 set_state_val(PART:"iconify-src", STATE_REL2_OFFSET, x + w - 1, y + h - 1);
267 set_state(PART:"iconify-src", "custom", 0.0);
268 }
269 }
270 }
271 parts { 250 parts {
272 part { name: "iconify-src"; type: SPACER;
273 description { state: "default" 0.0;
274 rel2.relative: 0.0 0.0;
275 rel2.offset: 0 0;
276 }
277 }
278 part { name: "clipper"; type: RECT; 251 part { name: "clipper"; type: RECT;
279 description { state: "default" 0.0; 252 description { state: "default" 0.0;
280 rel1.relative: -1.0 -1.0; 253 rel1.relative: -1.0 -1.0;
@@ -320,10 +293,6 @@ group { name: "e/comp/frame/default";
320 rel1.relative: 0.0 0.0; 293 rel1.relative: 0.0 0.0;
321 rel2.relative: 1.0 1.0; 294 rel2.relative: 1.0 1.0;
322 } 295 }
323 description { state: "iconic";
324 rel1.to: "iconify-src";
325 rel2.to: "iconify-src";
326 }
327 } 296 }
328 part { name: "focus-clipper"; 297 part { name: "focus-clipper";
329 type: RECT; 298 type: RECT;
@@ -430,48 +399,6 @@ group { name: "e/comp/frame/default";
430 transition: SINUSOIDAL 0.6 CURRENT; 399 transition: SINUSOIDAL 0.6 CURRENT;
431 target: "glow"; 400 target: "glow";
432 } 401 }
433 program { name: "iconify_defer";
434 action: SIGNAL_EMIT "e,action,iconify,done" "e";
435 }
436 program { name: "uniconify_defer";
437 action: SIGNAL_EMIT "e,action,uniconify,done" "e";
438 }
439 program { name: "iconify";
440 action: STATE_SET "iconic" 0.0;
441 transition: ACCELERATE_FACTOR 0.4 2 CURRENT;
442 target: "shower";
443 after: "iconify_defer";
444 }
445 program { name: "uniconify";
446 action: STATE_SET "visible" 0.0;
447 transition: DECELERATE_FACTOR 0.2 2 CURRENT;
448 target: "shower";
449 after: "uniconify_defer";
450 }
451 program {
452 signal: "e,action,uniconify"; source: "e";
453 script {
454 if (iconifying==1) {
455 stop_program(get_program_id("iconify"));
456 iconifying=0;
457 run_program(get_program_id("iconify_defer"));
458 }
459 uniconifying=1;
460 run_program(get_program_id("uniconify"));
461 }
462 }
463 program {
464 signal: "e,action,iconify"; source: "e";
465 script {
466 if (uniconifying==1) {
467 stop_program(get_program_id("uniconify"));
468 uniconifying=0;
469 run_program(get_program_id("uniconify_defer"));
470 }
471 iconifying=1;
472 run_program(get_program_id("iconify"));
473 }
474 }
475 } 402 }
476} 403}
477 404
@@ -525,12 +452,6 @@ group { name: "e/comp/frame/rotate/fast";
525 program { name: "focus_off3"; 452 program { name: "focus_off3";
526 transition: LINEAR 0; 453 transition: LINEAR 0;
527 } 454 }
528 program { name: "iconify";
529 transition: DECELERATE 0.15 CURRENT;
530 }
531 program { name: "uniconify";
532 transition: DECELERATE 0.15 CURRENT;
533 }
534 } 455 }
535} 456}
536 457
@@ -568,12 +489,6 @@ group { name: "e/comp/frame/flip/fast";
568 program { name: "focus_off3"; 489 program { name: "focus_off3";
569 transition: LINEAR 0; 490 transition: LINEAR 0;
570 } 491 }
571 program { name: "iconify";
572 transition: DECELERATE 0.15 CURRENT;
573 }
574 program { name: "uniconify";
575 transition: DECELERATE 0.15 CURRENT;
576 }
577 } 492 }
578} 493}
579 494
@@ -647,12 +562,6 @@ group { name: "e/comp/frame/default/fast";
647 name: "focus_off"; 562 name: "focus_off";
648 transition: SINUSOIDAL 0; 563 transition: SINUSOIDAL 0;
649 } 564 }
650 program { name: "iconify";
651 transition: DECELERATE 0.15 CURRENT;
652 }
653 program { name: "uniconify";
654 transition: DECELERATE 0.15 CURRENT;
655 }
656 } 565 }
657} 566}
658 567
@@ -713,14 +622,6 @@ group { name: "e/comp/frame/none";
713 signal: "e,state,hidden"; source: "e"; 622 signal: "e,state,hidden"; source: "e";
714 action: SIGNAL_EMIT "e,action,hide,done" "e"; 623 action: SIGNAL_EMIT "e,action,hide,done" "e";
715 } 624 }
716 program {
717 signal: "e,action,iconify"; source: "e";
718 action: SIGNAL_EMIT "e,action,iconify,done" "e";
719 }
720 program {
721 signal: "e,action,uniconify"; source: "e";
722 action: SIGNAL_EMIT "e,action,uniconify,done" "e";
723 }
724 } 625 }
725} 626}
726 627
diff --git a/data/themes/edc/comp_effects.edc b/data/themes/edc/comp_effects.edc
index 9d7aaf801..d937df982 100644
--- a/data/themes/edc/comp_effects.edc
+++ b/data/themes/edc/comp_effects.edc
@@ -420,6 +420,84 @@ group { name: "e/comp/effects/auto/grow";
420 } 420 }
421} 421}
422 422
423group { name: "e/comp/effects/iconify/default";
424 alias: "e/comp/effects/iconify/ibar";
425 alias: "e/comp/effects/iconify/ibox";
426 alias: "e/comp/effects/iconify/tasks";
427 inherit: "e/comp/effects/auto/pane";
428 data.item: "noclip" "1";
429 script {
430 public message(Msg_Type:type, id, ...) {
431 if ((type == MSG_INT_SET) && (id == 0)) {
432 /* set state */
433 new st;
434
435 st = getarg(2);
436
437 if (st == 1)
438 set_state(PART:"mover", "custom", 0.0);
439 else
440 set_state(PART:"mover", "default", 0.0);
441 } else if ((type == MSG_INT_SET) && (id == 1)) {
442 // border geom[4] / destination[4]
443 new x, y, w, h;
444 new dx, dy, dw, dh;
445 x = getarg(2);
446 y = getarg(3);
447 w = getarg(4);
448 h = getarg(5);
449 dx = getarg(6);
450 dy = getarg(7);
451 dw = getarg(8);
452 dh = getarg(9);
453 x = x + (w / 2);
454 y = y + (h / 2);
455 dx = dx - x;
456 dy = dy - y;
457 custom_state(PART:"mover", "default", 0.0);
458 set_state_val(PART:"mover", STATE_REL1, 1.0, 1.0);
459 set_state_val(PART:"mover", STATE_REL2, 0.0, 0.0);
460 set_state_val(PART:"mover", STATE_REL1_OFFSET, dx, dy);
461 set_state_val(PART:"mover", STATE_REL2_OFFSET, dx + dw - 1, dy + dh - 1);
462 }
463 }
464 }
465 programs {
466 program {
467 name: "show"; //iconify
468 signal: "e,action,go";
469 source: "e";
470 filter: "mover" "default";
471 action: STATE_SET "custom" 0.0;
472 transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
473 target: "mover";
474 after: "done";
475 }
476 program {
477 name: "hide"; //iconify
478 signal: "e,action,go";
479 source: "e";
480 filter: "mover" "custom";
481 action: STATE_SET "default" 0.0;
482 transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
483 target: "mover";
484 after: "done";
485 }
486 program {
487 name: "stop";
488 signal: "e,action,stop";
489 source: "e";
490 action: ACTION_STOP;
491 target: "show";
492 target: "hide";
493 }
494 program {
495 name: "done";
496 action: SIGNAL_EMIT "e,action,done" "e";
497 }
498 }
499}
500
423#if 0 //this is weirdly broken with proxy visibility somehow... 501#if 0 //this is weirdly broken with proxy visibility somehow...
424group { name: "e/comp/effects/auto/rotate"; 502group { name: "e/comp/effects/auto/rotate";
425 inherit: "e/comp/effects/auto/pane"; 503 inherit: "e/comp/effects/auto/pane";