haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for context menu hanging up in GAL.

This commit is contained in:
Maciej Suminski 2014-05-22 17:59:36 +02:00
parent b688f9bc20
commit dd1fcd0588
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/tool/tool_manager.cpp
View File

@ -493,7 +493,7 @@ bool TOOL_MANAGER::ProcessEvent( TOOL_EVENT& aEvent )
// If nothing was chosen from the context menu, we must notify the tool as well
if( menu->GetSelected() < 0 )
{
TOOL_EVENT evt( TC_COMMAND, TA_CONTEXT_MENU_CHOICE );
TOOL_EVENT evt( TC_COMMAND, TA_CONTEXT_MENU_CHOICE, -1 );
dispatchInternal( evt );
}
@ -518,10 +518,6 @@ void TOOL_MANAGER::ScheduleContextMenu( TOOL_BASE* aTool, CONTEXT_MENU* aMenu,
st->contextMenu = aMenu;
st->contextMenuTrigger = aTrigger;
// the tool wants the menu immediately? Preempt it and do so :)
if( aTrigger == CMENU_NOW )
st->cofunc->Yield();
}

2
include/tool/context_menu.h
View File

@ -97,7 +97,7 @@ protected:
m_customHandler = aHandler;
}
virtual OPT_TOOL_EVENT handleCustomEvent(const wxEvent& aEvent )
virtual OPT_TOOL_EVENT handleCustomEvent( const wxEvent& aEvent )
{
return OPT_TOOL_EVENT();
}

4
pcbnew/tools/selection_tool.cpp
View File

@ -451,12 +451,10 @@ BOARD_ITEM* SELECTION_TOOL::disambiguationMenu( GENERAL_COLLECTOR* aCollector )
{
brightBox.reset( new BRIGHT_BOX( current ) );
getView()->Add( brightBox.get() );
// BRIGHT_BOX is removed from view on destruction
}
}
// Removes possible brighten mark
getView()->MarkTargetDirty( KIGFX::TARGET_OVERLAY );
return current;
}