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

Do not reset the selection after changing hotkey

This commit is contained in:
Chris Pavlina 2016-01-15 21:06:07 -05:00 committed by Chris Pavlina
parent 06add0d130
commit b2a5307e4b
1 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/widgets/widget_hotkey_list.cpp
View File

@ -235,18 +235,11 @@ void WIDGET_HOTKEY_LIST::EditItem( wxTreeListItem aItem )
wxString current_key = GetItemText( aItem, 1 ); wxString current_key = GetItemText( aItem, 1 );
wxKeyEvent key_event = HK_PROMPT_DIALOG::PromptForKey( GetParent(), name, current_key ); wxKeyEvent key_event = HK_PROMPT_DIALOG::PromptForKey( GetParent(), name, current_key );
if( hkdata )
{
long key = MapKeypressToKeycode( key_event ); long key = MapKeypressToKeycode( key_event );
if( key == 0 ) if( hkdata && key )
{
// key: Escape
UnselectAll();
}
else
{ {
// See if this key code is handled in hotkeys names list // See if this key code is handled in hotkeys names list
bool exists; bool exists;
KeyNameFromKeyCode( key, &exists ); KeyNameFromKeyCode( key, &exists );
@ -260,14 +253,11 @@ void WIDGET_HOTKEY_LIST::EditItem( wxTreeListItem aItem )
{ {
hkdata->GetHotkey().m_KeyCode = key; hkdata->GetHotkey().m_KeyCode = key;
} }
}
// Remove selection
UnselectAll();
}
}
}
UpdateFromClientData(); UpdateFromClientData();
} }
}
void WIDGET_HOTKEY_LIST::ResetItem( wxTreeListItem aItem ) void WIDGET_HOTKEY_LIST::ResetItem( wxTreeListItem aItem )