From a7f69cdd5a7ddd31fc461bc41f2320ba3e3e4738 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Sun, 24 Nov 2013 19:55:00 +0100 Subject: [PATCH] Fix context menu not being restored properly When showing a context menu on a clickable, we used to hide existing context menu item to avoid confusing the user. However, those actions were never unhidden again. This resulted in the context menu not showing most options ever again in subsequent invocations. Instead of hiding the actions, we now just clear the menu. --- src/qtui/chatitem.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/qtui/chatitem.cpp b/src/qtui/chatitem.cpp index cbbb54bb..57265137 100644 --- a/src/qtui/chatitem.cpp +++ b/src/qtui/chatitem.cpp @@ -805,9 +805,8 @@ void ContentsChatItem::addActionsToMenu(QMenu *menu, const QPointF &pos) break; case Clickable::Channel: { - // Hide existing menu actions, they confuse us when right-clicking on a clickable - foreach(QAction *action, menu->actions()) - action->setVisible(false); + // Remove existing menu actions, they confuse us when right-clicking on a clickable + menu->clear(); QString name = data(ChatLineModel::DisplayRole).toString().mid(click.start(), click.length()); GraphicalUi::contextMenuActionProvider()->addActions(menu, chatScene()->filter(), data(MessageModel::BufferIdRole).value(), name); break; -- 2.20.1