From 6005da618775d545c664371f53571a75eacab7f2 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Wed, 22 Jan 2020 01:40:56 -0500
Subject: ShellMenuCollection, events not processed yet

---
 src/filetree.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/filetree.cpp')

diff --git a/src/filetree.cpp b/src/filetree.cpp
index 7128665d..543be82b 100644
--- a/src/filetree.cpp
+++ b/src/filetree.cpp
@@ -540,7 +540,19 @@ void FileTree::showShellMenu(QPoint pos)
     auto& menu = menus.begin()->second;
     menu.exec(m_tree, m_tree->viewport()->mapToGlobal(pos));
   } else {
+    env::ShellMenuCollection mc;
 
+    for (auto&& m : menus) {
+      const auto* origin = m_core.directoryStructure()->findOriginByID(m.first);
+      if (!origin) {
+        log::error("origin {} not found for merged menus", m.first);
+        continue;
+      }
+
+      mc.add(QString::fromStdWString(origin->getName()), std::move(m.second));
+    }
+
+    mc.exec(m_tree, m_tree->viewport()->mapToGlobal(pos));
   }
 }
 
-- 
cgit v1.3.1