[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 6dbd460fa91e8676b928bdbc3aad2e12ded2ffc1
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 27 03:25:26 2002 +0000

    	- fixed 2953256 -- JavaScript window.moveTo() and window.moveBy() methods do not work
    
            * kwq/KWQWindowWidget.mm: (KWQWindowWidget::frameGeometry): Fix calculation.
    	It was returning the bottom left coordinate instead of the top left.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2181 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 4be4fd0..a8f2564 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,12 @@
 2002-09-26  Darin Adler  <darin at apple.com>
 
+	- fixed 2953256 -- JavaScript window.moveTo() and window.moveBy() methods do not work
+
+        * kwq/KWQWindowWidget.mm: (KWQWindowWidget::frameGeometry): Fix calculation.
+	It was returning the bottom left coordinate instead of the top left.
+
+2002-09-26  Darin Adler  <darin at apple.com>
+
 	- fixed 3060459 -- REGRESSION: crash leaving page that sets cookie in JavaScript
 	unload handler
 
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 4be4fd0..a8f2564 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,12 @@
 2002-09-26  Darin Adler  <darin at apple.com>
 
+	- fixed 2953256 -- JavaScript window.moveTo() and window.moveBy() methods do not work
+
+        * kwq/KWQWindowWidget.mm: (KWQWindowWidget::frameGeometry): Fix calculation.
+	It was returning the bottom left coordinate instead of the top left.
+
+2002-09-26  Darin Adler  <darin at apple.com>
+
 	- fixed 3060459 -- REGRESSION: crash leaving page that sets cookie in JavaScript
 	unload handler
 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4be4fd0..a8f2564 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,12 @@
 2002-09-26  Darin Adler  <darin at apple.com>
 
+	- fixed 2953256 -- JavaScript window.moveTo() and window.moveBy() methods do not work
+
+        * kwq/KWQWindowWidget.mm: (KWQWindowWidget::frameGeometry): Fix calculation.
+	It was returning the bottom left coordinate instead of the top left.
+
+2002-09-26  Darin Adler  <darin at apple.com>
+
 	- fixed 3060459 -- REGRESSION: crash leaving page that sets cookie in JavaScript
 	unload handler
 
diff --git a/WebCore/kwq/KWQWindowWidget.mm b/WebCore/kwq/KWQWindowWidget.mm
index 7a693cf..21ca14f 100644
--- a/WebCore/kwq/KWQWindowWidget.mm
+++ b/WebCore/kwq/KWQWindowWidget.mm
@@ -88,7 +88,7 @@ QSize KWQWindowWidget::sizeHint() const
 QRect KWQWindowWidget::frameGeometry() const
 {
     NSRect frame = [d->window frame];
-    return QRect((int)frame.origin.x, (int)(NSMaxY([[[NSScreen screens] objectAtIndex:0] frame]) - frame.origin.y),
+    return QRect((int)frame.origin.x, (int)(NSMaxY([[[NSScreen screens] objectAtIndex:0] frame]) - NSMaxY(frame)),
 		 (int)frame.size.width, (int)frame.size.height);
 }
 
@@ -114,7 +114,8 @@ QPoint KWQWindowWidget::mapFromGlobal(const QPoint &p) const
 void KWQWindowWidget::setFrameGeometry(const QRect &r)
 {
     // FIXME: should try to avoid saving changes
-    [d->window setFrame:NSMakeRect(r.x(), NSMaxY([[[NSScreen screens] objectAtIndex:0] frame]) - r.y() - r.height(), r.width(), r.height()) display:NO];
+    [d->window setFrame:NSMakeRect(r.x(), NSMaxY([[[NSScreen screens] objectAtIndex:0] frame]) - (r.y() + r.height()),
+        r.width(), r.height()) display:NO];
 }
 
 @implementation KWQWindowWidgetDeleter

-- 
WebKit Debian packaging