Changeset 603

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).

Location:

trunk/src/gui

Files:

• kernel/qapplication_pm.cpp (modified) (7 diffs)
• kernel/qcursor_pm.cpp (modified) (2 diffs)
• kernel/qdnd_pm.cpp (modified) (2 diffs)
• kernel/qwidget_pm.cpp (modified) (6 diffs)
• kernel/qwindowdefs_pm.h (modified) (1 diff)
• util/qsystemtrayicon_pm.cpp (modified) (2 diffs)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -433 +433 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 // application no-grab option
 bool qt_nograb()
@@ -676 +694 @@
 {
     // flip y coordinate
-    int y = desktop()->height() - (pos.y() + 1);
+    int y = 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 = height() - (ptl.y + 1);
     }
 
@@ -1551 +1569 @@
     WinQueryPointerPos(HWND_DESKTOP, &curPos);
     // flip y coordinate
-    curPos.y = q_func()->desktop()->height() - (curPos.y + 1);
+    curPos.y = qheight() - (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 = 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 = 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 = height() - (swp.y + swp.cy);
             QTLWExtra *top = d_func()->topData();
             swp.x += top->frameStrut.left();

trunk/src/gui/kernel/qcursor_pm.cpp

@@ -121 +121 @@
     WinQueryPointerPos(HWND_DESKTOP, &p);
     // flip y coordinate
-    p.y = QApplication::desktop()->height() - (p.y + 1);
+    p.y = height() - (p.y + 1);
     return QPoint(p.x, p.y);
 }
@@ -128 +128 @@
 {
     // flip y coordinate
-    y = QApplication::desktop()->height() - (y + 1);
+    y = height() - (y + 1);
     WinSetPointerPos(HWND_DESKTOP, x, y);
 }

trunk/src/gui/kernel/qdnd_pm.cpp

@@ -473 +473 @@
             // flip y coordinate
             QPoint pnt(info->xDrop, info->yDrop);
-            pnt.setY(QApplication::desktop()->height() - (pnt.y() + 1));
+            pnt.setY(height() - (pnt.y() + 1));
             pnt = widget->mapFromGlobal(pnt);
 
@@ -688 +688 @@
             // flip y coordinate
             QPoint pnt(info->xDrop, info->yDrop);
-            pnt.setY(QApplication::desktop()->height() - (pnt.y() + 1));
+            pnt.setY(height() - (pnt.y() + 1));
             pnt = widget->mapFromGlobal(pnt);
             if (dragData->lastDragOverWidget != widget)

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 = 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 = 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()),
+                                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 = 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 = height() - (swp.y + swp.cy);
     cswp.y = swp.cy - (cswp.y + cswp.cy);
     QRect &fs = top->frameStrut;

trunk/src/gui/kernel/qwindowdefs_pm.h

@@ -83 +83 @@
 Q_GUI_EXPORT HPS qt_display_ps();
 
+
+
+
 Q_GUI_EXPORT QWidget *qWidgetFromHWND(HWND hwnd);
 

trunk/src/gui/util/qsystemtrayicon_pm.cpp

@@ -121 +121 @@
     RECTL rcl;
     if (xstQuerySysTrayIconRect(winId(), 0, &rcl)) {
-        int sh = QApplication::desktop()->height();
+        int sh = height();
         // flip y coordinates
         rcl.yTop = sh - rcl.yTop;
@@ -213 +213 @@
                         QPoint gpos(pMsg->ptsPointerPos.x,
                                     // flip y coordinate
-                                    QApplication::desktop()->height() -
-                                        (pMsg->ptsPointerPos.y + 1));
+                                    qt_display_height() - (pMsg->ptsPointerPos.y + 1));
                         q->contextMenu()->popup(gpos);
                         q->contextMenu()->activateWindow();