Changeset 603 for trunk/src/gui/kernel/qwidget_pm.cpp

Timestamp:

Feb 25, 2010, 4:31:14 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Fixed assertion at #1125 in qwidget.cpp (due to an attempt to re-instantiate QDesktopWidget during application termination).

File:

• trunk/src/gui/kernel/qwidget_pm.cpp (modified) (6 diffs)

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -284 +284 @@
     // first, process areas placed outside the screen bounds
     if (flags & PWO_Screen) {
-        RECTL rclScr = { 0, 0, QApplication::desktop()->width(),
-                               QApplication::desktop()->height() };
+        RECTL rclScr = { 0, 0, qt_display_width(), qt_display_height() };
         WinMapWindowPoints(HWND_DESKTOP, hwnd, (PPOINTL) &rclScr, 2);
         // rough check of whether some window part is outside bounds
@@ -1540 +1539 @@
     WinMapWindowPoints(internalWinId(), HWND_DESKTOP, &ptl, 1);
     // flip y (global) coordinate
-    ptl.y = QApplication::desktop()->height() - (ptl.y + 1);
+    ptl.y = qt_display_height() - (ptl.y + 1);
     return QPoint(ptl.x, ptl.y);
 }
@@ -1557 +1556 @@
     ptl.x = pos.x();
     // flip y (global) coordinate
-    ptl.y = QApplication::desktop()->height() - (pos.y() + 1);
+    ptl.y = qt_display_height() - (pos.y() + 1);
     WinMapWindowPoints(HWND_DESKTOP, internalWinId(), &ptl, 1);
     // flip y (local) coordinate
@@ -1756 +1755 @@
                 WinSetWindowPos(fId, HWND_TOP, r.left(),
                                 // flip y coodrinate
-                                QApplication::desktop()->height() - (r.top() + r.height()),
+                                qt_display_height() - (r.top() + r.height()),
                                 r.width(), r.height(), fl);
             } else {
@@ -2117 +2116 @@
             data.crect.setRect(x, y, w, h);
         } else if (q->isWindow()) {
-            int sh = QApplication::desktop()->height();
+            int sh = qt_display_height();
             QRect fs(frameStrut());
             if (extra) {
@@ -2408 +2407 @@
     WinQueryWindowPos(data.winid, &cswp);
     // flip y coordinates
-    swp.y = QApplication::desktop()->height() - (swp.y + swp.cy);
+    swp.y = qt_display_height() - (swp.y + swp.cy);
     cswp.y = swp.cy - (cswp.y + cswp.cy);
     QRect &fs = top->frameStrut;