Bug 574861 - Windows should never be movable in fullscreen mode. r=enn
authorDão Gottwald <dao@mozilla.com>
Sat, 26 Jun 2010 16:49:15 +0200
changeset 46272 33800216d2f2604e6800ce7d19f7dfe376aeb358
parent 46271 fae5d6bd9c533d17fb0e40990381be3de3a47006
child 46273 bdde034a1265141e9282c9779e65583cf9702ed5
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersenn
bugs574861
milestone1.9.3a6pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 574861 - Windows should never be movable in fullscreen mode. r=enn
toolkit/content/WindowDraggingUtils.jsm
toolkit/content/widgets/toolbar.xml
--- a/toolkit/content/WindowDraggingUtils.jsm
+++ b/toolkit/content/WindowDraggingUtils.jsm
@@ -45,17 +45,19 @@ function WindowDraggingElement(elem, win
 WindowDraggingElement.prototype = {
   mouseDownCheck: function(e) { return true; },
   dragTags: ["box", "hbox", "vbox", "spacer", "label", "statusbarpanel", "stack",
              "toolbaritem", "toolbarseparator", "toolbarspring", "toolbarspacer",
              "radiogroup", "deck", "scrollbox", "arrowscrollbox", "tabs"],
   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;
 
         let target = aEvent.originalTarget, parent = aEvent.originalTarget;
         while (parent != this._elem) {
           let mousethrough = parent.getAttribute("mousethrough");
           if (mousethrough == "always")
             target = parent.parentNode;
--- a/toolkit/content/widgets/toolbar.xml
+++ b/toolkit/content/widgets/toolbar.xml
@@ -442,18 +442,18 @@
     <implementation>
       <constructor><![CDATA[
         if (!this._draggableStarted) {
           this._draggableStarted = true;
           try {
             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) {}
         }
       ]]></constructor>
     </implementation>
   </binding>
 
   <binding id="menubar" extends="chrome://global/content/bindings/toolbar.xml#toolbar-base" display="xul:menubar">