Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
dd1fcd05
Commit
dd1fcd05
authored
May 22, 2014
by
Maciej Suminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for context menu hanging up in GAL.
parent
b688f9bc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
9 deletions
+3
-9
tool_manager.cpp
common/tool/tool_manager.cpp
+1
-5
context_menu.h
include/tool/context_menu.h
+1
-1
selection_tool.cpp
pcbnew/tools/selection_tool.cpp
+1
-3
No files found.
common/tool/tool_manager.cpp
View file @
dd1fcd05
...
...
@@ -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
();
}
...
...
include/tool/context_menu.h
View file @
dd1fcd05
...
...
@@ -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
();
}
...
...
pcbnew/tools/selection_tool.cpp
View file @
dd1fcd05
...
...
@@ -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
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment