Implement these methods correctly.
authorlars <lars@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 19 Jun 2007 10:13:09 +0000 (10:13 +0000)
committerlars <lars@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 19 Jun 2007 10:13:09 +0000 (10:13 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@23585 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/platform/qt/PlatformScreenQt.cpp

index 0c3c48fae331324dfd2068a35de82a09ddc1afde..10f417a564141cc0d0c1b1c933258df04a0a163d 100644 (file)
@@ -1,3 +1,13 @@
+2007-06-19  Lars Knoll <lars@trolltech.com>
+
+        Reviewed by Zack
+
+        Implement these methods correctly.
+
+        * platform/qt/PlatformScreenQt.cpp:
+        (WebCore::screenRect):
+        (WebCore::screenAvailableRect):
+
 2007-06-19  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Geoff.
index e7986c4b02b269135cbbf7aff9a5eb9c7b3e7334..b7a5a0b509ded7b27f4cabe038df0f06abe87a8f 100644 (file)
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2007 Trolltech ASA
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -57,12 +58,14 @@ bool screenIsMonochrome(Widget* w)
 
 FloatRect screenRect(Widget* w)
 {
-    return static_cast<QRectF>(QApplication::desktop()->screenGeometry(w->qwidget()));
+    QRect r = QApplication::desktop()->screenGeometry(w->qwidget());
+    return FloatRect(r.x(), r.y(), r.width(), r.height());
 }
 
 FloatRect screenAvailableRect(Widget* w)
 {
-    return static_cast<QRectF>(QApplication::desktop()->availableGeometry(w->qwidget()));
+    QRect r = QApplication::desktop()->availableGeometry(w->qwidget());
+    return FloatRect(r.x(), r.y(), r.width(), r.height());
 }
 
 } // namespace WebCore