1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix popup menus with no parent windows

Browse Source 
The QMenu API doesn't play well with Wayland. You can do:

QMenu menu;
menu.popup(someGlobalPos);

which is completely broken on wayland. If some popup window doesn't
have a transient parent use the current focus window for that.
Fixes right-click popups in qdbusviewer and other apps.

Change-Id: I3227f4ec27431ca8ec156971cbfdbf1e848a0527
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
This commit is contained in:
Giulio Camuffo 2015-01-18 15:53:46 +02:00
parent b52533db83
commit 817633a831
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/platforms/wayland/qwaylandwindow.cpp
View File

@ -226,14 +226,21 @@ void QWaylandWindow::setGeometry(const QRect &rect)
void QWaylandWindow::setVisible(bool visible) void QWaylandWindow::setVisible(bool visible)
{ {
if (visible) { if (visible) {
if (window()->type() == Qt::Popup && transientParent()) { if (window()->type() == Qt::Popup) {
QWaylandWindow *parent = transientParent(); QWaylandWindow *parent = transientParent();
mMouseDevice = parent->mMouseDevice; if (!parent) {
mMouseSerial = parent->mMouseSerial; // Try with the current focus window. It may be the wrong one but we need to have
// some parent to have popups act as popups.
parent = mDisplay->currentInputDevice()->pointerFocus();
}
if (parent) {
mMouseDevice = parent->mMouseDevice;
mMouseSerial = parent->mMouseSerial;
QWaylandWlShellSurface *wlshellSurface = dynamic_cast<QWaylandWlShellSurface*>(mShellSurface); QWaylandWlShellSurface *wlshellSurface = dynamic_cast<QWaylandWlShellSurface*>(mShellSurface);
if (mMouseDevice && wlshellSurface) { if (mMouseDevice && wlshellSurface) {
wlshellSurface->setPopup(transientParent(), mMouseDevice, mMouseSerial); wlshellSurface->setPopup(parent, mMouseDevice, mMouseSerial);
}
} }
} }