Changeset 284

Timestamp:

Nov 3, 2009, 3:55:19 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: QSystemTrayIcon: Make sure that in "we don't have window masks" mode the Qt-drawn notification balloon is positioned correctly not only when the system tray widget is in the top left corner of the screen [vendor bug]. Also, enable this "no mask" mode on OS/2 where we don't have masks for top-level widgets at all.

File:

• trunk/src/gui/util/qsystemtrayicon.cpp (modified) (2 diffs)

trunk/src/gui/util/qsystemtrayicon.cpp

@@ -575 +575 @@
 
     QPainterPath path;
-#if defined(QT_NO_XSHAPE) && defined(Q_WS_X11)
+#if )
     // XShape is required for setting the mask, so we just
-    // draw an ugly square when its not available
+    // draw an ugly square when its not available
     path.moveTo(0, 0);
     path.lineTo(sz.width() - 1, 0);
@@ -583 +583 @@
     path.lineTo(0, sz.height() - 1);
     path.lineTo(0, 0);
-    move(qMax(pos.x() - sz.width(), scr.left()), pos.y());
+    if (arrowAtTop && arrowAtLeft) {
+        move(qMax(pos.x(), scr.left() + 2), pos.y());
+    } else if (arrowAtTop && !arrowAtLeft) {
+        move(qMin(pos.x() - sh.width(), scr.right() - sh.width() - 2), pos.y());
+    } else if (!arrowAtTop && !arrowAtLeft) {
+        move(qMin(pos.x() - sh.width(), scr.right() - sh.width() - 2), pos.y() - sh.height());
+    } else if (!arrowAtTop && arrowAtLeft) {
+        move(qMax(pos.x(), scr.x() + 2), pos.y() - sh.height());
+    }
 #else
     path.moveTo(ml + rc, mt);