Changeset 603 for trunk/src/gui/kernel/qapplication_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/qapplication_pm.cpp (modified) (7 diffs)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -433 +433 @@
 }
 
+Q_GUI_EXPORT int qt_display_width()
+{
+    // display resolution is constant for any given bootup
+    static LONG displayWidth = 0;
+    if (displayWidth == 0)
+        displayWidth = WinQuerySysValue(HWND_DESKTOP, SV_CXSCREEN);
+    return displayWidth;
+}
+
+Q_GUI_EXPORT int qt_display_height()
+{
+    // display resolution is constant for any given bootup
+    static LONG displayHeight = 0;
+    if (displayHeight == 0)
+        displayHeight = WinQuerySysValue(HWND_DESKTOP, SV_CYSCREEN);
+    return displayHeight;
+}
+
 // application no-grab option
 bool qt_nograb()
@@ -676 +694 @@
 {
     // flip y coordinate
-    int y = desktop()->height() - (pos.y() + 1);
+    int y = qt_display_height() - (pos.y() + 1);
     POINTL ptl = { pos.x(), y };
     HWND hwnd = WinWindowFromPoint(HWND_DESKTOP, &ptl, FALSE);
@@ -753 +771 @@
         }
         // flip y coordinate
-        ptl.y = QApplication::desktop()->height() - (ptl.y + 1);
+        ptl.y = qt_display_height() - (ptl.y + 1);
     }
 
@@ -1551 +1569 @@
     WinQueryPointerPos(HWND_DESKTOP, &curPos);
     // flip y coordinate
-    curPos.y = q_func()->desktop()->height() - (curPos.y + 1);
+    curPos.y = qt_display_height() - (curPos.y + 1);
 
     if (QApplicationPrivate::popupWidgets->isEmpty()) {
@@ -1998 +2016 @@
                 POINTL ptl = gpos;
                 // flip y coordinate
-                ptl.y = QApplication::desktop()->height() - (ptl.y + 1);
+                ptl.y = qt_display_height() - (ptl.y + 1);
                 WinMapWindowPoints(HWND_DESKTOP, hwndTarget, &ptl, 1);
                 WinPostMsg(hwndTarget, qmsg.msg,
@@ -2099 +2117 @@
     // get a confusing behavior (too many lines scrolled etc.).
     {
-        int devh = QApplication::desktop()->height();
+        int devh = qt_display_height();
         QMSG wheelMsg;
         while (WinPeekMsg(0, &wheelMsg, qmsg.hwnd, qmsg.msg, qmsg.msg, PM_NOREMOVE)) {
@@ -2328 +2346 @@
             WinQueryWindowPos(fId, &swp);
             // flip y coordinate
-            swp.y = QApplication::desktop()->height() - (swp.y + swp.cy);
+            swp.y = qt_display_height() - (swp.y + swp.cy);
             QTLWExtra *top = d_func()->topData();
             swp.x += top->frameStrut.left();