From 40896c02d996f69f7bf4e8adebe28acdbff8d350 Mon Sep 17 00:00:00 2001 From: Méven Car Date: Tue, 12 Mar 2019 08:54:46 -0600 Subject: Correctly position context menu of the information panel under wayland with a secondary screen Summary: According to my testing this bug occurs because Qcursor::pos() does not work as expected under wayland on a secondary screen, then it returns inaccurate data. This could hide bugs elsewhere. BUG: 404799 FIXED-IN: 19.04.0 Test Plan: Under Wayland test the context menu on both screens. Do the same under Xorg. Reviewers: #dolphin, elvisangelaccio Reviewed By: #dolphin, elvisangelaccio Subscribers: elvisangelaccio, ngraham, nicolasfella, kfm-devel Tags: #dolphin Differential Revision: https://phabricator.kde.org/D19535 --- src/panels/information/informationpanelcontent.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/panels/information/informationpanelcontent.cpp') diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp index 6f671e683..bf87f9b5a 100644 --- a/src/panels/information/informationpanelcontent.cpp +++ b/src/panels/information/informationpanelcontent.cpp @@ -264,7 +264,7 @@ bool InformationPanelContent::eventFilter(QObject* obj, QEvent* event) return QWidget::eventFilter(obj, event); } -void InformationPanelContent::configureSettings(const QList& customContextMenuActions) +void InformationPanelContent::configureSettings(const QList& customContextMenuActions, const QPointF& pos) { QMenu popup(this); @@ -288,7 +288,7 @@ void InformationPanelContent::configureSettings(const QList& customCon // Open the popup and adjust the settings for the // selected action. - QAction* action = popup.exec(QCursor::pos()); + QAction* action = popup.exec(pos.toPoint()); if (!action) { return; } -- cgit v1.3