┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/panels
diff options
context:
space:
mode:
authorElvis Angelaccio <[email protected]>2019-03-10 12:45:43 +0100
committerElvis Angelaccio <[email protected]>2019-03-10 12:45:43 +0100
commit9f2bb143b5ee00eddaaebbfe83da2f2da9f18863 (patch)
treee8c0038a797b289538fbc718ae69f7cbe274161b /src/panels
parent3c9efb362a9c7079a1e05822b846b0d34b3fb2a4 (diff)
[FoldersPanel] Stop ignoring positions from the controller
This fixes the position of Folder panel's context menus on multi-screens on Wayland, because `QCursor::pos()` is not reliable on those setups.
Diffstat (limited to 'src/panels')
-rw-r--r--src/panels/folders/folderspanel.cpp8
-rw-r--r--src/panels/folders/treeviewcontextmenu.cpp4
-rw-r--r--src/panels/folders/treeviewcontextmenu.h2
3 files changed, 5 insertions, 9 deletions
diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp
index 95953f66b..020c41e55 100644
--- a/src/panels/folders/folderspanel.cpp
+++ b/src/panels/folders/folderspanel.cpp
@@ -214,12 +214,10 @@ void FoldersPanel::slotItemMiddleClicked(int index)
void FoldersPanel::slotItemContextMenuRequested(int index, const QPointF& pos)
{
- Q_UNUSED(pos);
-
const KFileItem fileItem = m_model->fileItem(index);
QPointer<TreeViewContextMenu> contextMenu = new TreeViewContextMenu(this, fileItem);
- contextMenu.data()->open();
+ contextMenu.data()->open(pos.toPoint());
if (contextMenu.data()) {
delete contextMenu.data();
}
@@ -227,10 +225,8 @@ void FoldersPanel::slotItemContextMenuRequested(int index, const QPointF& pos)
void FoldersPanel::slotViewContextMenuRequested(const QPointF& pos)
{
- Q_UNUSED(pos);
-
QPointer<TreeViewContextMenu> contextMenu = new TreeViewContextMenu(this, KFileItem());
- contextMenu.data()->open();
+ contextMenu.data()->open(pos.toPoint());
if (contextMenu.data()) {
delete contextMenu.data();
}
diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp
index f8cb0b4d6..df9b9d62e 100644
--- a/src/panels/folders/treeviewcontextmenu.cpp
+++ b/src/panels/folders/treeviewcontextmenu.cpp
@@ -55,7 +55,7 @@ TreeViewContextMenu::~TreeViewContextMenu()
{
}
-void TreeViewContextMenu::open()
+void TreeViewContextMenu::open(const QPoint& pos)
{
QMenu* popup = new QMenu(m_parent);
@@ -161,7 +161,7 @@ void TreeViewContextMenu::open()
}
QPointer<QMenu> popupPtr = popup;
- popup->exec(QCursor::pos());
+ popup->exec(pos);
if (popupPtr.data()) {
popupPtr.data()->deleteLater();
}
diff --git a/src/panels/folders/treeviewcontextmenu.h b/src/panels/folders/treeviewcontextmenu.h
index a9491fb5c..245b7d6b0 100644
--- a/src/panels/folders/treeviewcontextmenu.h
+++ b/src/panels/folders/treeviewcontextmenu.h
@@ -49,7 +49,7 @@ public:
~TreeViewContextMenu() override;
/** Opens the context menu modal. */
- void open();
+ void open(const QPoint& pos);
private slots:
/** Cuts the item m_fileItem. */