diff options
author | Alexander Volkov <a.volkov@rusbitech.ru> | 2015-10-30 18:15:18 +0300 |
---|---|---|
committer | Gatis Paeglis <gatis.paeglis@qt.io> | 2018-07-10 20:04:09 +0000 |
commit | 556221d97b6c4ca387ca5535ef8f0a2b0f5b7644 (patch) | |
tree | 8eb0a37a1f3f8abb85af30a508aa3ae487436135 /src/platformheaders/xcbfunctions/qxcbwindowfunctions.qdoc | |
parent | 5cf6f51b4c73cb1309279aa42d828097b24aa119 (diff) |
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>
Diffstat (limited to 'src/platformheaders/xcbfunctions/qxcbwindowfunctions.qdoc')
-rw-r--r-- | src/platformheaders/xcbfunctions/qxcbwindowfunctions.qdoc | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/src/platformheaders/xcbfunctions/qxcbwindowfunctions.qdoc b/src/platformheaders/xcbfunctions/qxcbwindowfunctions.qdoc index fab473b91b..5e2aa2cbf2 100644 --- a/src/platformheaders/xcbfunctions/qxcbwindowfunctions.qdoc +++ b/src/platformheaders/xcbfunctions/qxcbwindowfunctions.qdoc @@ -138,81 +138,6 @@ */ /*! - \typedef QXcbWindowFunctions::SetParentRelativeBackPixmap - - This is the typedef for the function returned by - QGuiApplication::platformFunction when passed the - value returned by setParentRelativeBackPixmapIdentifier(). -*/ - -/*! - \fn const QByteArray QXcbWindowFunctions::setParentRelativeBackPixmapIdentifier() - - This function returns the byte array that can be used to query - QGuiApplication::platformFunction to retrieve the SetParentRelativeBackPixmap function. -*/ - -/*! - \fn void QXcbWindowFunctions::setParentRelativeBackPixmap(const QWindow *window) - - This is a convenience function that can be used directly instead - of resolving the function pointer. \a window will be - relayed to the function retrieved by QGuiApplication. -*/ - -/*! - \typedef QXcbWindowFunctions::RequestSystemTrayWindowDock - - This is the typedef for the function returned by - QGuiApplication::platformFunction when passed the - value returned by requestSystemTrayWindowDockIdentifier(). -*/ - -/*! - \fn const QByteArray QXcbWindowFunctions::requestSystemTrayWindowDockIdentifier() - - This function returns the byte array that can be used to query - QGuiApplication::platformFunction to retrieve the RequestSystemTrayWindowDock function. -*/ - -/*! - \fn bool QXcbWindowFunctions::requestSystemTrayWindowDock(const QWindow *window) - - This is a convenience function that can be used directly instead - of resolving the function pointer. \a window will be - relayed to the function retrieved by QGuiApplication. - - Returns the boolean result of calling the function or false if the - function was not found. -*/ - -/*! - \typedef QXcbWindowFunctions::SystemTrayWindowGlobalGeometry - - This is the typedef for the function returned by - QGuiApplication::platformFunction when passed the - value returned by systemTrayWindowGlobalGeometryIdentifier(). -*/ - -/*! - \fn const QByteArray QXcbWindowFunctions::systemTrayWindowGlobalGeometryIdentifier() - - This function returns the byte array that can be used to query - QGuiApplication::platformFunction to retrieve the SystemTrayWindowGlobalGeometry function. -*/ - -/*! - \fn QRect QXcbWindowFunctions::systemTrayWindowGlobalGeometry(const QWindow *window) - - This is a convenience function that can be used directly instead - of resolving the function pointer. \a window will be - relayed to the function retrieved by QGuiApplication. - - Returns the QRect result of calling the function or an empty - QRect if the function was not found. -*/ - -/*! \typedef QXcbWindowFunctions::VisualId This is the typedef for the function returned by |