Changeset 134

Timestamp:

Aug 27, 2009, 2:02:17 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Implemented QDesktopWidget.

Location:

trunk/src/gui/kernel

Files:

• qapplication_pm.cpp (modified) (1 diff)
• qdesktopwidget_pm.cpp (modified) (5 diffs)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -519 +519 @@
 
         switch(msg) {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
         case WM_BUTTON1DOWN:

trunk/src/gui/kernel/qdesktopwidget_pm.cpp

@@ -47 +47 @@
 #include "qwidget_p.h"
 
+
+
 QT_BEGIN_NAMESPACE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 class QDesktopWidgetPrivate : public QWidgetPrivate
 {
 public:
+
 };
 
@@ -71 +95 @@
 QDesktopWidget::QDesktopWidget()
     : QWidget(*new QDesktopWidgetPrivate, 0, Qt::Desktop)
-  {
+{
     setObjectName(QLatin1String("desktop"));
-    // @todo implement
 }
 
@@ -87 +110 @@
 int QDesktopWidget::primaryScreen() const
 {
-    // @todo implement
     return 0;
 }
@@ -93 +115 @@
 int QDesktopWidget::numScreens() const
 {
-    // @todo implement
-    return 0;
+    return 1;
 }
 
@@ -105 +126 @@
 const QRect QDesktopWidget::availableGeometry(int screen) const
 {
-    // @todo implement
-    return QRect();
+    Q_D(const QDesktopWidget);
+
+    if (!d->workArea.isValid())
+        const_cast<QDesktopWidget *>(this)->resizeEvent(0);
+    if (d->workArea.isValid())
+        return d->workArea;
+
+    return geometry();
 }
 
 const QRect QDesktopWidget::screenGeometry(int screen) const
 {
-    // @todo implement
-    return QRect();
+    return geometry();
 }
 
-int QDesktopWidget::screenNumber(const QWidget *widget) const
+int QDesktopWidget::screenNumber(const QWidget *) const
 {
-    // @todo implement
     return 0;
 }
 
-int QDesktopWidget::screenNumber(const QPoint &point) const
+int QDesktopWidget::screenNumber(const QPoint &) const
 {
-    // @todo implement
     return 0;
 }
 
-void QDesktopWidget::resizeEvent(QResizeEvent *)
+void QDesktopWidget::resizeEvent(QResizeEvent *)
 {
-    // @todo implement
+    Q_D(QDesktopWidget);
+
+    if (e == 0) {
+        // this is a Work Area Changed notification, see WM_SYSVALUECHANGED
+        // in qapplication_pm.cpp
+        typedef
+        BOOL (APIENTRY *WinQueryDesktopWorkArea_T) (HWND hwndDesktop,
+                                                    PRECTL pwrcWorkArea);
+        static WinQueryDesktopWorkArea_T WinQueryDesktopWorkArea =
+            (WinQueryDesktopWorkArea_T) ~0;
+
+        if ((ULONG) WinQueryDesktopWorkArea == (ULONG) ~0) {
+            if (qt_DosQueryProcAddr("PMMERGE", 5469,
+                                    (PFN *) &WinQueryDesktopWorkArea))
+                WinQueryDesktopWorkArea = NULL;
+        }
+
+        if (WinQueryDesktopWorkArea) {
+            RECTL rcl;
+            if (WinQueryDesktopWorkArea(HWND_DESKTOP, &rcl)) {
+                // flip y coordinates
+                d->workArea.setCoords(rcl.xLeft, height() - rcl.yTop,
+                                      rcl.xRight - 1,
+                                      height() - (rcl.yBottom + 1));
+            }
+        }
+
+        emit workAreaResized(0);
+        return;
+    }
+
+    // otherwise nothing to do, the desktop cannot be dynamically resized
+    // on OS/2
 }