Merge branch 'master' into js-modules

1 files changed, 12 insertions, 0 deletions

diff --git a/application/basilisk/base/content/browser-fullScreenAndPointerLock.js b/application/basilisk/base/content/browser-fullScreenAndPointerLock.js
index 497e51121..dbc9478c1 100644
--- a/application/basilisk/base/content/browser-fullScreenAndPointerLock.js
+++ b/application/basilisk/base/content/browser-fullScreenAndPointerLock.js
@@ -320,6 +320,18 @@ var FullScreen = {
       document.addEventListener("keypress", this._keyToggleCallback, false);
       document.addEventListener("popupshown", this._setPopupOpen, false);
       document.addEventListener("popuphidden", this._setPopupOpen, false);
+      // If it is not safe to collapse, add the mouse position tracker or
+      // else it won't be possible to hide the navigation toolbox again
+      if (!this._safeToCollapse()) {
+        let rect = gBrowser.mPanelContainer.getBoundingClientRect();
+        this._mouseTargetRect = {
+          top: rect.top + 50,
+          bottom: rect.bottom,
+          left: rect.left,
+          right: rect.right
+        };
+        MousePosTracker.addListener(this);
+      }
       // In DOM fullscreen mode, we hide toolbars with CSS
       if (!document.fullscreenElement)
         this.hideNavToolbox(true);