Changeset 28083 in webkit

Timestamp:

Nov 27, 2007 3:05:49 PM (16 years ago)

Author:

timothy@apple.com

Message:

WebCore:

Reviewed by Kevin McCullough.

Bug 16161: window.moveBy(0, 0) moves the window by -22px vertically
​http://bugs.webkit.org/show_bug.cgi?id=16161

Removed the "Adjust the window rect to be in the coordinate space of
the screen rect" step which was always adding (0,22) to the window
position (on the main screen). Instead, account for screen X and Y
in the bottom and right constrain step.

Added more test cases to: fast/dom/Window/window-resize.html

• bindings/js/kjs_window.cpp: (KJS::adjustWindowRect):

LayoutTests:

Reviewed by Kevin McCullough.

Bug 16161: window.moveBy(0, 0) moves the window by -22px vertically
​http://bugs.webkit.org/show_bug.cgi?id=16161

Added test cases for moveBy(0, 0), moveBy(0, 1) and moveBy(1, 0).

• fast/dom/Window/window-resize.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/Window/window-resize.html (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/kjs_window.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-11-27  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Kevin McCullough.
+
+        Bug 16161: window.moveBy(0, 0) moves the window by -22px vertically
+        http://bugs.webkit.org/show_bug.cgi?id=16161
+
+        Added test cases for moveBy(0, 0), moveBy(0, 1) and  moveBy(1, 0).
+
+        * fast/dom/Window/window-resize.html:
+
 2007-11-26  Timothy Hatcher  <timothy@apple.com>
 

trunk/LayoutTests/fast/dom/Window/window-resize.html

@@ -178 +178 @@
     debug('');
 
+    x = screen.width / 4;
+    y = screen.height / 4;
+    window.resizeTo(x, y);
+
+    x = screen.width / 2;
+    y = screen.height / 2;
+    window.moveTo(x - (window.outerWidth / 2), y - (window.outerHeight / 2));
+
+    var previousScreenX = window.screenX;
+    var previousScreenY = window.screenY;
+
+    x = 0;
+    y = 0;
+    window.moveBy(x, y);
+    debug("Testing - moveBy: Zero Zero");
+    shouldBe('window.screenY', previousScreenY.toString());
+    shouldBe('window.screenX', previousScreenX.toString());
+
+    debug('');
+
+    previousScreenX += 1;
+
+    x = 1;
+    y = 0;
+    window.moveBy(x, y);
+    debug("Testing - moveBy: One Zero");
+    shouldBe('window.screenY', previousScreenY.toString());
+    shouldBe('window.screenX', previousScreenX.toString());
+
+    debug('');
+
+    previousScreenY += 1;
+
+    x = 0;
+    y = 1;
+    window.moveBy(x, y);
+    debug("Testing - moveBy: Zero One");
+    shouldBe('window.screenY', previousScreenY.toString());
+    shouldBe('window.screenX', previousScreenX.toString());
+
+    debug('');
+
+    window.moveTo(0,0);
+    window.resizeTo(screen.width, screen.height);
+
     x = -100;
     y = -100;

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-11-27  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Kevin McCullough.
+
+        Bug 16161: window.moveBy(0, 0) moves the window by -22px vertically
+        http://bugs.webkit.org/show_bug.cgi?id=16161
+
+        Removed the "Adjust the window rect to be in the coordinate space of
+        the screen rect" step which was always adding (0,22) to the window
+        position (on the main screen). Instead, account for screen X and Y
+        in the bottom and right constrain step.
+
+        Added more test cases to: fast/dom/Window/window-resize.html
+
+        * bindings/js/kjs_window.cpp:
+        (KJS::adjustWindowRect):
+
 2007-11-27  Timothy Hatcher  <timothy@apple.com>
 

trunk/WebCore/bindings/js/kjs_window.cpp

@@ -1230 +1230 @@
     // Constrain the window to the bottom and right of the screen if it's past
     // the right or below it.
-    window.setX(window.x() - max(0.0f, window.right() - screen.width()));
-    window.setY(window.y() - max(0.0f, window.bottom() - screen.height()));
-    
-    // Adjust the window rect to be in the coordinate space of the screen rect
-    window.setX(window.x() + screen.x());
-    window.setY(window.y() + screen.y());
+    window.setX(window.x() - max(0.0f, window.right() - screen.width() - screen.x()));
+    window.setY(window.y() - max(0.0f, window.bottom() - screen.height() - screen.y()));
 }