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

WindowOverlay: animate the close button together with the border

Browse Source 
Since the introduction of overlay hover borders, there has a been
a timing disconnection between hiding the border and button, and
this creates noise and reduces the effect of the window+overlay
as a single unit.
Solve that by animating the close button too, so that the two actors
are shown and hidden always at the same time.
Also, consolidate the code to make it clear to future authors that
those two items need to stay coordinated.

https://bugzilla.gnome.org/show_bug.cgi?id=688966
This commit is contained in:
Giovanni Campagna
2012-11-24 04:04:38 +01:00
parent 242dc8cddd
commit 96f44e1959
1 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
js/ui/workspace.js
View File

@ -500,11 +500,9 @@ const WindowOverlay = new Lang.Class({
hide: function() { hide: function() {
this._hidden = true; this._hidden = true;
this.closeButton.hide();
this.title.hide(); this.title.hide();
this.title.remove_style_pseudo_class('hover');
this.border.hide(); this.hideCloseButton();
}, },
show: function() { show: function() {
@ -664,7 +662,13 @@ const WindowOverlay = new Lang.Class({
_animateVisible: function() { _animateVisible: function() {
this._parentActor.raise_top(); this._parentActor.raise_top();
this.closeButton.show(); this.closeButton.show();
this.closeButton.opacity = 0;
Tweener.addTween(this.closeButton,
{ opacity: 255,
time: CLOSE_BUTTON_FADE_TIME,
transition: 'easeOutQuad' });
this.border.show(); this.border.show();
this.border.opacity = 0; this.border.opacity = 0;
@ -676,6 +680,22 @@ const WindowOverlay = new Lang.Class({
this.title.add_style_pseudo_class('hover'); this.title.add_style_pseudo_class('hover');
}, },
_animateInvisible: function() {
this.closeButton.opacity = 255;
Tweener.addTween(this.closeButton,
{ opacity: 0,
time: CLOSE_BUTTON_FADE_TIME,
transition: 'easeInQuad' });
this.border.opacity = 255;
Tweener.addTween(this.border,
{ opacity: 0,
time: CLOSE_BUTTON_FADE_TIME,
transition: 'easeInQuad' });
this.title.remove_style_pseudo_class('hover');
},
_onEnter: function() { _onEnter: function() {
// We might get enter events on the clone while the overlay is // We might get enter events on the clone while the overlay is
// hidden, e.g. during animations, we ignore these events, // hidden, e.g. during animations, we ignore these events,
@ -695,18 +715,10 @@ const WindowOverlay = new Lang.Class({
_idleToggleCloseButton: function() { _idleToggleCloseButton: function() {
this._idleToggleCloseId = 0; this._idleToggleCloseId = 0;
if (!this._windowClone.actor.has_pointer && if (!this._windowClone.actor.has_pointer &&
!this.closeButton.has_pointer) { !this.closeButton.has_pointer)
this.closeButton.hide(); this._animateInvisible();
this.border.opacity = 255;
Tweener.addTween(this.border,
{ opacity: 0,
time: CLOSE_BUTTON_FADE_TIME,
transition: 'easeInQuad' });
this.title.remove_style_pseudo_class('hover');
}
return false; return false;
}, },