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

dash: improve timing of labels

Browse Source 
DashItem labels have initial delay before showing up, but once the
first label in the dash is visible (meaning the user is very likely
exploring things) and the pointer is moved along the dash, the label
will follow immediately.

https://bugzilla.gnome.org/show_bug.cgi?id=666170

Signed-off-by: Seif Lotfy <seif.lotfy@collabora.co.uk>
This commit is contained in:
Seif Lotfy 2012-01-20 16:14:16 +01:00 committed by Florian Müllner
parent 29da720e6a
commit 6829590c8f
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
js/ui/dash.js
View File

@ -298,7 +298,9 @@ const Dash = new Lang.Class({
this._dragPlaceholderPos = -1; this._dragPlaceholderPos = -1;
this._animatingPlaceholdersCount = 0; this._animatingPlaceholdersCount = 0;
this._favRemoveTarget = null; this._favRemoveTarget = null;
this._labelTimeoutId = 0; this._showLabelTimeoutId = 0;
this._resetHoverTimeoutId = 0;
this._labelShowing = false;
this._box = new St.BoxLayout({ name: 'dash', this._box = new St.BoxLayout({ name: 'dash',
vertical: true, vertical: true,
@ -448,18 +450,31 @@ const Dash = new Lang.Class({
_onHover: function (item, display) { _onHover: function (item, display) {
if (display.actor.get_hover() && !display.isMenuUp) { if (display.actor.get_hover() && !display.isMenuUp) {
if (this._labelTimeoutId == 0) { if (this._showLabelTimeoutId == 0) {
this._labelTimeoutId = Mainloop.timeout_add(DASH_ITEM_HOVER_TIMEOUT, let timeout = this._labelShowing ? 0 : DASH_ITEM_HOVER_TIMEOUT;
this._showLabelTimeoutId = Mainloop.timeout_add(timeout,
Lang.bind(this, function() { Lang.bind(this, function() {
this._labelShowing = true;
item.showLabel(); item.showLabel();
return false; return false;
})); }));
if (this._resetHoverTimeoutId > 0) {
Mainloop.source_remove(this._resetHoverTimeoutId);
this._resetHoverTimeoutId = 0;
}
} }
} else { } else {
if (this._labelTimeoutId > 0) if (this._showLabelTimeoutId > 0)
Mainloop.source_remove(this._labelTimeoutId); Mainloop.source_remove(this._showLabelTimeoutId);
this._labelTimeoutId = 0; this._showLabelTimeoutId = 0;
item.hideLabel(); item.hideLabel();
if (this._labelShowing) {
this._resetHoverTimeoutId = Mainloop.timeout_add(DASH_ITEM_HOVER_TIMEOUT,
Lang.bind(this, function() {
this._labelShowing = false;
return false;
}));
}
} }
}, },