diff options
| author | Alexander Volkov <a.volkov@rusbitech.ru> | 2018-09-24 13:45:57 +0300 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-09-29 09:33:11 +0000 |
| commit | a34054c75e18326d10328baa9e39fc9eab0cbfc9 (patch) | |
| tree | 13bf5ed1899153540d17872695a0ab94731ce455 /src/plugins/platforms | |
| parent | 60cecc86f8cde0b2d4e727b9d0fe8a6cb994d660 (diff) | |
xcb: Extract QXcbWindow::isTrayIconWindow()
Introduce this static function to detect tray icon windows.
The old non-static method was unused, so drop it.
Change-Id: Ia97b8a857bd1807ecd56340efbc9b145844d593e
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbintegration.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbwindow.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbwindow.h | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp index 7458643ae5..9fc1189181 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.cpp +++ b/src/plugins/platforms/xcb/qxcbintegration.cpp @@ -232,7 +232,7 @@ QPlatformPixmap *QXcbIntegration::createPlatformPixmap(QPlatformPixmap::PixelTyp QPlatformWindow *QXcbIntegration::createPlatformWindow(QWindow *window) const { QXcbGlIntegration *glIntegration = nullptr; - const bool isTrayIconWindow = window->objectName() == QLatin1String("QSystemTrayIconSysWindow"); + const bool isTrayIconWindow = QXcbWindow::isTrayIconWindow(window);; if (window->type() != Qt::Desktop && !isTrayIconWindow) { if (window->supportsOpenGL()) { glIntegration = defaultConnection()->glIntegration(); @@ -277,7 +277,7 @@ QPlatformOpenGLContext *QXcbIntegration::createPlatformOpenGLContext(QOpenGLCont QPlatformBackingStore *QXcbIntegration::createPlatformBackingStore(QWindow *window) const { - const bool isTrayIconWindow = window->objectName() == QLatin1String("QSystemTrayIconSysWindow"); + const bool isTrayIconWindow = QXcbWindow::isTrayIconWindow(window); if (isTrayIconWindow) return new QXcbSystemTrayBackingStore(window); diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp index 35639d4b88..69fc6c2951 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp @@ -297,7 +297,7 @@ void QXcbWindow::create() destroy(); m_windowState = Qt::WindowNoState; - m_trayIconWindow = window()->objectName() == QLatin1String("QSystemTrayIconSysWindow"); + m_trayIconWindow = isTrayIconWindow(window()); Qt::WindowType type = window()->type(); diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h index 99e8e40725..f7d76ed3b2 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.h +++ b/src/plugins/platforms/xcb/qxcbwindow.h @@ -173,7 +173,10 @@ public: bool startSystemMoveResize(const QPoint &pos, int corner); void doStartSystemMoveResize(const QPoint &globalPos, int corner); - bool isTrayIconWindow() const { return m_trayIconWindow; } + static bool isTrayIconWindow(QWindow *window) + { + return window->objectName() == QLatin1String("QSystemTrayIconSysWindow"); + } virtual void create(); virtual void destroy(); |