From 73fa4b1cbdecfe33070affec8d8e303437f6898b Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Sat, 9 Mar 2013 21:11:46 -0500
Subject: [PATCH] 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
---
 js/ui/layout.js      | 3 +++
 js/ui/messageTray.js | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/js/ui/layout.js b/js/ui/layout.js
index b04cb5a36..d24d1475c 100644
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -432,6 +432,9 @@ const LayoutManager = new Lang.Class({
                                                  Shell.KeyBindingMode.OVERVIEW);
         this._trayPressure.setEventFilter(this._trayBarrierEventFilter);
         this._trayPressure.connect('trigger', function(barrier) {
+            if (Main.layoutManager.bottomMonitor.inFullscreen)
+                return;
+
             Main.messageTray.openTray();
         });
     },
diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 15629f5a5..b4fd4e763 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -1823,6 +1823,9 @@ const MessageTray = new Lang.Class({
     _trayDwellTimeout: function() {
         this._trayDwellTimeoutId = 0;
 
+        if (Main.layoutManager.bottomMonitor.inFullscreen)
+            return false;
+
         // 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
         // overview we have to take the overview's modal push into account