tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed detection of shorcut key conflicts when filtering 

Currently, when the shortcut mapper is filtering shortcuts, it doesn't display key conflicts properly. This is due to the indexes of the filtered shortcuts being different (since there are less) than the original list of shortcuts.

Author @jmbockhorst
(the original branch has been deleted)

Fix #5374, close #5453
This commit is contained in:
Don Ho 2021-08-03 13:16:08 +02:00
parent 90485aaa21
commit 8a77b07d96
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
PowerEditor/src/WinControls/Grid/ShortcutMapper.cpp
View File

@ -1057,6 +1057,10 @@ INT_PTR CALLBACK ShortcutMapper::run_dlgProc(UINT message, WPARAM wParam, LPARAM
NppParameters& nppParam = NppParameters::getInstance();
const size_t currentIndex = LOWORD(lParam) - 1;
// In case of using filter will make the filtered items change index, so here we get its real index
size_t realIndexOfSelectedItem = _shortcutIndex[currentIndex];
generic_string conflictInfo;
switch (_currentState)
@ -1064,37 +1068,37 @@ INT_PTR CALLBACK ShortcutMapper::run_dlgProc(UINT message, WPARAM wParam, LPARAM
case STATE_MENU:
{
vector<CommandShortcut> & vShortcuts = nppParam.getUserShortcuts();
findKeyConflicts(&conflictInfo, vShortcuts[currentIndex].getKeyCombo(), currentIndex);
findKeyConflicts(&conflictInfo, vShortcuts[realIndexOfSelectedItem].getKeyCombo(), realIndexOfSelectedItem);
}
break;
case STATE_MACRO:
{
vector<MacroShortcut> & vShortcuts = nppParam.getMacroList();
findKeyConflicts(&conflictInfo, vShortcuts[currentIndex].getKeyCombo(), currentIndex);
findKeyConflicts(&conflictInfo, vShortcuts[realIndexOfSelectedItem].getKeyCombo(), realIndexOfSelectedItem);
}
break;
case STATE_USER:
{
vector<UserCommand> & vShortcuts = nppParam.getUserCommandList();
findKeyConflicts(&conflictInfo, vShortcuts[currentIndex].getKeyCombo(), currentIndex);
findKeyConflicts(&conflictInfo, vShortcuts[realIndexOfSelectedItem].getKeyCombo(), realIndexOfSelectedItem);
}
break;
case STATE_PLUGIN:
{
vector<PluginCmdShortcut> & vShortcuts = nppParam.getPluginCommandList();
findKeyConflicts(&conflictInfo, vShortcuts[currentIndex].getKeyCombo(), currentIndex);
findKeyConflicts(&conflictInfo, vShortcuts[realIndexOfSelectedItem].getKeyCombo(), realIndexOfSelectedItem);
}
break;
case STATE_SCINTILLA:
{
vector<ScintillaKeyMap> & vShortcuts = nppParam.getScintillaKeyList();
size_t sciCombos = vShortcuts[currentIndex].getSize();
size_t sciCombos = vShortcuts[realIndexOfSelectedItem].getSize();
for (size_t sciIndex = 0; sciIndex < sciCombos; ++sciIndex)
findKeyConflicts(&conflictInfo, vShortcuts[currentIndex].getKeyComboByIndex(sciIndex), currentIndex);
findKeyConflicts(&conflictInfo, vShortcuts[realIndexOfSelectedItem].getKeyComboByIndex(sciIndex), realIndexOfSelectedItem);
}
break;
}