diff options
| author | Mike Blumenkrantz <zmike@osg.samsung.com> | 2015-11-23 12:14:48 -0500 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@osg.samsung.com> | 2015-11-23 12:28:47 -0500 |
| commit | 90bfa8d2a3317aa2b8f861256b8b23743f976385 (patch) | |
| tree | a3e648ad901ab8a3145ee46bff5e4b7b51e2c914 /data | |
| parent | 53b172ef039a2da04aa3b28283f5935e320fe5bc (diff) | |
| download | elementary-90bfa8d2a3317aa2b8f861256b8b23743f976385.tar.gz | |
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
Diffstat (limited to 'data')
| -rw-r--r-- | data/themes/edc/ibar-ibox.edc | 22 |
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"; group { name: "e/modules/ibox/icon_overlay"; alias: "e/modules/ibar/icon_overlay"; images.image: "darken_square.png" COMP; + script_recursion: 1; script { public urgent; + public active; } parts { part { name: "item_clip"; type: RECT; @@ -578,21 +580,29 @@ group { name: "e/modules/ibox/icon_overlay"; } program { name: "go_active"; signal: "e,state,focused"; source: "e"; - action: STATE_SET "visible" 0.0; - target: "background"; + script { + set_state(PART:"background", "visible", 0.0); + set_int(active, 1); + } after: "go_active2"; } program { name: "go_active2"; action: STATE_SET "hidden" 0.0; transition: LINEAR 0.5; target: "background"; - after: "go_active"; + sequence { + script { + if (get_int(active) == 1) + run_program(get_program_id("go_active")); + } + } } program { name: "go_passive"; signal: "e,state,unfocused"; source: "e"; - action: ACTION_STOP; - target: "go_active"; - target: "go_active2"; + script { + stop_program(get_program_id("go_passive2")); + set_int(active, 0); + } after: "go_passive2"; } program { |