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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit df34e68b97213836b84470f6f8acbe05ae1bbe6c
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 22 22:03:36 2002 +0000

    Implemented KWQDesktopWidget to represent main screen.  Used by javascript.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@554 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index d1d14a4..619a7b1 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-01-22  Richard Williamson  <rjw at apple.com>
+
+    Implemented KWQDesktopWidget to represent main screen.  Used by javascript.
+    
+	* src/kwq/KWQApplication.mm: (KWQDesktopWidget::width),
+	(KWQDesktopWidget::height), (QApplication::desktop):
+
 2002-01-21  Maciej Stachowiak  <mjs at apple.com>
 
 	Reimplemented QArray, QBuffer, QStack and QStringList; also fixed
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d1d14a4..619a7b1 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-01-22  Richard Williamson  <rjw at apple.com>
+
+    Implemented KWQDesktopWidget to represent main screen.  Used by javascript.
+    
+	* src/kwq/KWQApplication.mm: (KWQDesktopWidget::width),
+	(KWQDesktopWidget::height), (QApplication::desktop):
+
 2002-01-21  Maciej Stachowiak  <mjs at apple.com>
 
 	Reimplemented QArray, QBuffer, QStack and QStringList; also fixed
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d1d14a4..619a7b1 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-01-22  Richard Williamson  <rjw at apple.com>
+
+    Implemented KWQDesktopWidget to represent main screen.  Used by javascript.
+    
+	* src/kwq/KWQApplication.mm: (KWQDesktopWidget::width),
+	(KWQDesktopWidget::height), (QApplication::desktop):
+
 2002-01-21  Maciej Stachowiak  <mjs at apple.com>
 
 	Reimplemented QArray, QBuffer, QStack and QStringList; also fixed
diff --git a/WebCore/kwq/KWQApplication.mm b/WebCore/kwq/KWQApplication.mm
index 9294a4c..b0a677f 100644
--- a/WebCore/kwq/KWQApplication.mm
+++ b/WebCore/kwq/KWQApplication.mm
@@ -43,9 +43,30 @@ QPalette QApplication::palette(const QWidget *p)
 
 static QWidget *mainWidget = 0;
 
+// Do we need to worry about multiple screens?
+class KWQDesktopWidget : public QWidget
+{
+public:
+    int width() const;
+    int height() const;
+};
+
+int KWQDesktopWidget::width() const
+{
+    return (int)[[NSScreen mainScreen] frame].size.width;
+}
+    
+int KWQDesktopWidget::height() const
+{
+    return (int)[[NSScreen mainScreen] frame].size.height;
+}
+
+
 QWidget *QApplication::desktop()
 {
-    // FIXME!  This should return a widget that represents the geometry of the desktop.
+    if (mainWidget == 0){
+        mainWidget = new KWQDesktopWidget();
+    }
     return mainWidget;
 }
 
diff --git a/WebCore/src/kwq/KWQApplication.mm b/WebCore/src/kwq/KWQApplication.mm
index 9294a4c..b0a677f 100644
--- a/WebCore/src/kwq/KWQApplication.mm
+++ b/WebCore/src/kwq/KWQApplication.mm
@@ -43,9 +43,30 @@ QPalette QApplication::palette(const QWidget *p)
 
 static QWidget *mainWidget = 0;
 
+// Do we need to worry about multiple screens?
+class KWQDesktopWidget : public QWidget
+{
+public:
+    int width() const;
+    int height() const;
+};
+
+int KWQDesktopWidget::width() const
+{
+    return (int)[[NSScreen mainScreen] frame].size.width;
+}
+    
+int KWQDesktopWidget::height() const
+{
+    return (int)[[NSScreen mainScreen] frame].size.height;
+}
+
+
 QWidget *QApplication::desktop()
 {
-    // FIXME!  This should return a widget that represents the geometry of the desktop.
+    if (mainWidget == 0){
+        mainWidget = new KWQDesktopWidget();
+    }
     return mainWidget;
 }
 

-- 
WebKit Debian packaging