QSystemTrayIcon/X11: Move platform-specific calls to the xcb plugin

- Detect the tray icon window in the platform plugin by the object
  name. This way we don't need
  QXcbWindowFunctions::requestSystemTrayWindowDockIdentifier().

- Get rid of unused calls
  QXcbIntegrationFunctions::xEmbedSystemTrayVisualHasAlphaChannel()
  and QXcbWindowFunctions::setParentRelativeBackPixmap().

- Mark the tray icon window as embedded to be able to get the correct
  result from QWindow::mapToGlobal(). It allows to drop
  QXcbWindowFunctions::systemTrayWindowGlobalGeometry().

This change allows to remove the intermediate level between
the QSystemTrayIconSys widget and the xcb plugin. The code looks
clearer.

Change-Id: I7d067131287a6dec162b36f0bddc8cb518aaa38c
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>

1 files changed, 3 insertions, 24 deletions

diff --git a/src/widgets/util/qsystemtrayicon_x11.cpp b/src/widgets/util/qsystemtrayicon_x11.cpp
index 3f6166ae78..86532456c7 100644
--- a/src/widgets/util/qsystemtrayicon_x11.cpp
+++ b/src/widgets/util/qsystemtrayicon_x11.cpp
@@ -63,8 +63,6 @@
 #include <private/qguiapplication_p.h>
 #include <qdebug.h>
 
-#include <QtPlatformHeaders/qxcbwindowfunctions.h>
-#include <QtPlatformHeaders/qxcbintegrationfunctions.h>
 #ifndef QT_NO_SYSTEMTRAYICON
 QT_BEGIN_NAMESPACE
 
@@ -98,8 +96,6 @@ private slots:
     void systemTrayWindowChanged(QScreen *screen);
 
 private:
-    bool addToTray();
-
     QSystemTrayIcon *q;
 };
 
@@ -117,30 +113,12 @@ QSystemTrayIconSys::QSystemTrayIconSys(QSystemTrayIcon *qIn)
     setGeometry(QRect(QPoint(0, 0), size));
     setMinimumSize(size);
     setAttribute(Qt::WA_TranslucentBackground);
-
-    addToTray();
-}
-
-bool QSystemTrayIconSys::addToTray()
-{
-    if (!locateSystemTray())
-        return false;
-
-    createWinId();
     setMouseTracking(true);
-
-    if (!QXcbWindowFunctions::requestSystemTrayWindowDock(windowHandle()))
-        return false;
-
-    show();
-    return true;
 }
 
 void QSystemTrayIconSys::systemTrayWindowChanged(QScreen *)
 {
-    if (locateSystemTray()) {
-        addToTray();
-    } else {
+    if (!locateSystemTray()) {
         QBalloonTip::hideBalloon();
         hide(); // still no luck
         destroy();
@@ -149,7 +127,7 @@ void QSystemTrayIconSys::systemTrayWindowChanged(QScreen *)
 
 QRect QSystemTrayIconSys::globalGeometry() const
 {
-    return QXcbWindowFunctions::systemTrayWindowGlobalGeometry(windowHandle());
+    return QRect(mapToGlobal(QPoint(0, 0)), size());
 }
 
 void QSystemTrayIconSys::mousePressEvent(QMouseEvent *ev)
@@ -244,6 +222,7 @@ void QSystemTrayIconPrivate::install_sys()
         sys = new QSystemTrayIconSys(q);
         QObject::connect(QGuiApplication::platformNativeInterface(), SIGNAL(systemTrayWindowChanged(QScreen*)),
                          sys, SLOT(systemTrayWindowChanged(QScreen*)));
+        sys->show();
     }
 }