messageTray: Don't open by pressure when we have a full-screen window open

When we have a full-screen window open, we expect the app to get all of
the chrome, so we should disable the bottom barrier as well.

https://bugzilla.gnome.org/show_bug.cgi?id=694997
This commit is contained in:
Jasper St. Pierre 2013-03-09 21:11:46 -05:00
parent 7766a91e8c
commit 73fa4b1cbd
2 changed files with 6 additions and 0 deletions

View File

@ -432,6 +432,9 @@ const LayoutManager = new Lang.Class({
Shell.KeyBindingMode.OVERVIEW); Shell.KeyBindingMode.OVERVIEW);
this._trayPressure.setEventFilter(this._trayBarrierEventFilter); this._trayPressure.setEventFilter(this._trayBarrierEventFilter);
this._trayPressure.connect('trigger', function(barrier) { this._trayPressure.connect('trigger', function(barrier) {
if (Main.layoutManager.bottomMonitor.inFullscreen)
return;
Main.messageTray.openTray(); Main.messageTray.openTray();
}); });
}, },

View File

@ -1823,6 +1823,9 @@ const MessageTray = new Lang.Class({
_trayDwellTimeout: function() { _trayDwellTimeout: function() {
this._trayDwellTimeoutId = 0; this._trayDwellTimeoutId = 0;
if (Main.layoutManager.bottomMonitor.inFullscreen)
return false;
// We don't want to open the tray when a modal dialog // We don't want to open the tray when a modal dialog
// is up, so we check the modal count for that. When we are in the // is up, so we check the modal count for that. When we are in the
// overview we have to take the overview's modal push into account // overview we have to take the overview's modal push into account