From bf26cf175f9ddf09c2f88c5e6261228e601999d0 Mon Sep 17 00:00:00 2001 From: "tomasz.wlostowski@cern.ch" Date: Tue, 10 Sep 2013 19:23:15 +0200 Subject: [PATCH] TOOL_MANAGER: open menu on right mouse button when requested --- common/tool/tool_manager.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/common/tool/tool_manager.cpp b/common/tool/tool_manager.cpp index 1601b7aece..16990abda3 100644 --- a/common/tool/tool_manager.cpp +++ b/common/tool/tool_manager.cpp @@ -81,8 +81,11 @@ struct TOOL_MANAGER::TOOL_STATE }; -TOOL_MANAGER::TOOL_MANAGER() +TOOL_MANAGER::TOOL_MANAGER() : + m_model (NULL), + m_view (NULL) { + } @@ -276,11 +279,17 @@ bool TOOL_MANAGER::ProcessEvent( TOOL_EVENT& aEvent ) { TOOL_STATE* st = m_toolIdIndex[toolId]; - if( st->contextMenuTrigger == CMENU_NOW ) + if( st->contextMenuTrigger != CMENU_OFF ) { + if(st->contextMenuTrigger == CMENU_BUTTON && !aEvent.IsClick( MB_Right ) ) + break; + st->pendingWait = true; st->waitEvents = TOOL_EVENT( TC_Any, TA_Any ); - st->contextMenuTrigger = CMENU_OFF; + + if(st->contextMenuTrigger == CMENU_NOW) + st->contextMenuTrigger = CMENU_OFF; + GetEditFrame()->PopupMenu( st->contextMenu->GetMenu() ); TOOL_EVENT evt( TC_Command, TA_ContextMenuChoice );