isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 587952 - Immediately fade in information button

Browse Source 
0.5s is a pretty long time, start immediate fade in.
This commit is contained in:
Colin Walters 2009-07-07 20:02:47 -04:00
parent c136acc879
commit 0971ba54b8
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/ui/button.js
View File

@ -119,7 +119,6 @@ Button.prototype = {
}; };
/* Delay before the icon should appear, in seconds after the pointer has entered the parent */ /* Delay before the icon should appear, in seconds after the pointer has entered the parent */
const SHOW_ICON_DELAY = 250; // 0.25 second
const ANIMATION_TIME = 0.25; const ANIMATION_TIME = 0.25;
/* This is an icon button that fades in/out when mouse enters/leaves the parent. /* This is an icon button that fades in/out when mouse enters/leaves the parent.
@ -149,8 +148,7 @@ iconButton.prototype = {
if(actor.get_children().indexOf(Shell.get_event_related(event)) != -1) if(actor.get_children().indexOf(Shell.get_event_related(event)) != -1)
return; return;
this._sourceId = Mainloop.timeout_add(SHOW_ICON_DELAY, this._fadeIn();
Lang.bind(this, this._fadeIn));
})); }));
parent.connect("leave-event", Lang.bind(this, function(actor, event) { parent.connect("leave-event", Lang.bind(this, function(actor, event) {
// Nothing to do if the cursor has merely entered a child of the parent actor // Nothing to do if the cursor has merely entered a child of the parent actor
@ -197,10 +195,6 @@ iconButton.prototype = {
/// Private methods /// /// Private methods ///
_fadeIn : function() { _fadeIn : function() {
if(this._sourceId) {
Mainloop.source_remove(this._sourceId);
this._sourceId = null;
}
Tweener.removeTweens(this.actor); Tweener.removeTweens(this.actor);
Tweener.addTween(this.actor, { opacity: 255, Tweener.addTween(this.actor, { opacity: 255,
time: ANIMATION_TIME, time: ANIMATION_TIME,
@ -208,10 +202,6 @@ iconButton.prototype = {
}, },
_fadeOut : function() { _fadeOut : function() {
if(this._sourceId) {
Mainloop.source_remove(this._sourceId);
this._sourceId = null;
}
Tweener.removeTweens(this.actor); Tweener.removeTweens(this.actor);
Tweener.addTween(this.actor, { opacity: 0, Tweener.addTween(this.actor, { opacity: 0,
time: ANIMATION_TIME, time: ANIMATION_TIME,