From 321694e97f7f0e34082f08564fa8f5ffb01c7df3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A3o=20Gottwald?= Date: Sat, 26 Jun 2010 16:49:15 +0200 Subject: [PATCH] Bug 574861 - Windows should never be movable in fullscreen mode. r=enn --- toolkit/content/WindowDraggingUtils.jsm | 4 +++- toolkit/content/widgets/toolbar.xml | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/toolkit/content/WindowDraggingUtils.jsm b/toolkit/content/WindowDraggingUtils.jsm index 7c800e5b53b8..bf5fd8a57df5 100644 --- a/toolkit/content/WindowDraggingUtils.jsm +++ b/toolkit/content/WindowDraggingUtils.jsm @@ -50,7 +50,9 @@ WindowDraggingElement.prototype = { handleEvent: function(aEvent) { switch (aEvent.type) { case "mousedown": - if (aEvent.button != 0 || !this.mouseDownCheck.call(this._elem, aEvent) || + if (aEvent.button != 0 || + this._window.fullScreen || + !this.mouseDownCheck.call(this._elem, aEvent) || aEvent.getPreventDefault()) return; diff --git a/toolkit/content/widgets/toolbar.xml b/toolkit/content/widgets/toolbar.xml index 943426f92f4d..c84c02c37466 100644 --- a/toolkit/content/widgets/toolbar.xml +++ b/toolkit/content/widgets/toolbar.xml @@ -447,8 +447,8 @@ Components.utils.import("resource://gre/modules/WindowDraggingUtils.jsm"); let draggableThis = new WindowDraggingElement(this, window); draggableThis.mouseDownCheck = function(e) { - // Don't move while customizing or while in full screen mode. - return !this.parentNode.customizing && !window.fullScreen; + // Don't move while customizing. + return !this.parentNode.customizing; } } catch (e) {} }