Changeset 603 for trunk/src/gui/util/qsystemtrayicon_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/util/qsystemtrayicon_pm.cpp (modified) (2 diffs)

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();