summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2015-11-23 12:14:48 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2015-11-23 12:28:47 -0500
commit90bfa8d2a3317aa2b8f861256b8b23743f976385 (patch)
treea3e648ad901ab8a3145ee46bff5e4b7b51e2c914
parent53b172ef039a2da04aa3b28283f5935e320fe5bc (diff)
ibar: stop mouse-in animation after current animation completes
previously, mousing out of an icon during the pulse animation would instantly stop the animation. this looks strange and is quite noticeable when mousing through a bar
-rw-r--r--data/themes/edc/ibar-ibox.edc22
1 files changed, 16 insertions, 6 deletions
diff --git a/data/themes/edc/ibar-ibox.edc b/data/themes/edc/ibar-ibox.edc
index 3d11c05d3..d0b12d460 100644
--- a/data/themes/edc/ibar-ibox.edc
+++ b/data/themes/edc/ibar-ibox.edc
@@ -429,8 +429,10 @@ group { name: "e/modules/ibar/menu/item";
429group { name: "e/modules/ibox/icon_overlay"; 429group { name: "e/modules/ibox/icon_overlay";
430 alias: "e/modules/ibar/icon_overlay"; 430 alias: "e/modules/ibar/icon_overlay";
431 images.image: "darken_square.png" COMP; 431 images.image: "darken_square.png" COMP;
432 script_recursion: 1;
432 script { 433 script {
433 public urgent; 434 public urgent;
435 public active;
434 } 436 }
435 parts { 437 parts {
436 part { name: "item_clip"; type: RECT; 438 part { name: "item_clip"; type: RECT;
@@ -578,21 +580,29 @@ group { name: "e/modules/ibox/icon_overlay";
578 } 580 }
579 program { name: "go_active"; 581 program { name: "go_active";
580 signal: "e,state,focused"; source: "e"; 582 signal: "e,state,focused"; source: "e";
581 action: STATE_SET "visible" 0.0; 583 script {
582 target: "background"; 584 set_state(PART:"background", "visible", 0.0);
585 set_int(active, 1);
586 }
583 after: "go_active2"; 587 after: "go_active2";
584 } 588 }
585 program { name: "go_active2"; 589 program { name: "go_active2";
586 action: STATE_SET "hidden" 0.0; 590 action: STATE_SET "hidden" 0.0;
587 transition: LINEAR 0.5; 591 transition: LINEAR 0.5;
588 target: "background"; 592 target: "background";
589 after: "go_active"; 593 sequence {
594 script {
595 if (get_int(active) == 1)
596 run_program(get_program_id("go_active"));
597 }
598 }
590 } 599 }
591 program { name: "go_passive"; 600 program { name: "go_passive";
592 signal: "e,state,unfocused"; source: "e"; 601 signal: "e,state,unfocused"; source: "e";
593 action: ACTION_STOP; 602 script {
594 target: "go_active"; 603 stop_program(get_program_id("go_passive2"));
595 target: "go_active2"; 604 set_int(active, 0);
605 }
596 after: "go_passive2"; 606 after: "go_passive2";
597 } 607 }
598 program { 608 program {