whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

XCB: Use screen's client leader as fallback for transient parent. 

Modal dialogs that do not have a QWidget parent may be hidden
by their parent unless they actually have a transient parent.

Task-number: QTBUG-27786
Change-Id: I7847df3517e5ba6e8d77a2a18c905e908a3cd2f4
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
bb10
Friedemann Kleint 2012-10-31 14:23:26 +01:00 committed by The Qt Project
parent 0c1bbf0386
commit 39964b94c9
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/platforms/xcb/qxcbwindow.cpp
View File

@ -542,16 +542,18 @@ void QXcbWindow::show()
propagateSizeHints();
// update WM_TRANSIENT_FOR
if (window()->transientParent() && isTransient(window())) {
QXcbWindow *transientXcbParent = static_cast<QXcbWindow *>(window()->transientParent()->handle());
if (transientXcbParent) {
// ICCCM 4.1.2.6
xcb_window_t parentWindow = transientXcbParent->xcb_window();
// todo: set transient for group (wm_client_leader) if no parent, a la qwidget_x11.cpp
if (isTransient(window())) {
xcb_window_t transientXcbParent = 0;
if (const QWindow *tp = window()->transientParent())
transientXcbParent = static_cast<const QXcbWindow *>(tp->handle())->winId();
// Default to client leader if there is no transient parent, else modal dialogs can
// be hidden by their parents.
if (!transientXcbParent)
transientXcbParent = static_cast<QXcbScreen *>(screen())->clientLeader();
if (transientXcbParent) { // ICCCM 4.1.2.6
Q_XCB_CALL(xcb_change_property(xcb_connection(), XCB_PROP_MODE_REPLACE, m_window,
XCB_ATOM_WM_TRANSIENT_FOR, XCB_ATOM_WINDOW, 32,
1, &parentWindow));
1, &transientXcbParent));
}
}