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

messageTray: Remove tray dwelling if we have new barrier features

Browse Source 
If we have the new barrier features, then we should not activate the
old tray dwelling mechanism.

https://bugzilla.gnome.org/show_bug.cgi?id=677215
This commit is contained in:
Jasper St. Pierre 2013-01-29 15:19:19 -05:00
parent 8035f30305
commit e614b993f2
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
js/ui/messageTray.js
View File

@ -1618,12 +1618,7 @@ const MessageTray = new Lang.Class({
this._sources = new Hash.Map(); this._sources = new Hash.Map();
this._chatSummaryItemsCount = 0; this._chatSummaryItemsCount = 0;
let pointerWatcher = PointerWatcher.getPointerWatcher(); this._setupTrayDwellIfNeeded();
pointerWatcher.addWatch(TRAY_DWELL_CHECK_INTERVAL, Lang.bind(this, this._checkTrayDwell));
this._trayDwellTimeoutId = 0;
this._trayDwelling = false;
this._trayDwellUserTime = 0;
this._sessionUpdated(); this._sessionUpdated();
this._noMessages = new St.Label({ text: _("No Messages"), this._noMessages = new St.Label({ text: _("No Messages"),
@ -1636,6 +1631,18 @@ const MessageTray = new Lang.Class({
this._updateNoMessagesLabel(); this._updateNoMessagesLabel();
}, },
_setupTrayDwellIfNeeded: function() {
// If we don't have extended barrier features, then we need
// to support the old tray dwelling mechanism.
if (!global.display.supports_extended_barriers()) {
let pointerWatcher = PointerWatcher.getPointerWatcher();
pointerWatcher.addWatch(TRAY_DWELL_CHECK_INTERVAL, Lang.bind(this, this._checkTrayDwell));
this._trayDwellTimeoutId = 0;
this._trayDwelling = false;
this._trayDwellUserTime = 0;
}
},
_updateNoMessagesLabel: function() { _updateNoMessagesLabel: function() {
this._noMessages.visible = this._sources.size() == 0; this._noMessages.visible = this._sources.size() == 0;
}, },