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

use ScintillaKeyMap::toString() to get all shortcuts 

simplifies code, also matches "or" in a list of multiple shortcuts.
This commit is contained in:
molsonkiko 2024-02-15 14:31:40 -08:00
parent 36793b5164
commit 840c4e5854
1 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,37 +224,17 @@ bool ShortcutMapper::isFilterValid(PluginCmdShortcut sc)
bool ShortcutMapper::isFilterValid(ScintillaKeyMap sc) bool ShortcutMapper::isFilterValid(ScintillaKeyMap sc)
{ {
// do a classic search on shortcut name, then see if *any* keycombo in _keyCombos matches // do a classic search on shortcut name,
// then see if the list of keycombos matches (e.g. "Ctrl+X or Alt+Y" matches "or" and "Alt" and "Ctrl+")
if (_shortcutFilter.empty()) if (_shortcutFilter.empty())
return true; return true;
wstring shortcut_name = stringToLower(string2wstring(sc.getName(), CP_UTF8)); wstring shortcut_name = stringToLower(string2wstring(sc.getName(), CP_UTF8));
if (shortcut_name.find(_shortcutFilter) != std::string::npos) if (shortcut_name.find(_shortcutFilter) != std::string::npos)
return true; // name matches; don't have to check shortcuts return true; // name matches
for (size_t i = 0; i < sc.getSize(); ++i) wstring shortcut_value = stringToLower(string2wstring(sc.toString(), CP_UTF8));
{ return shortcut_value.find(_shortcutFilter) != std::string::npos; // list of shortcuts matches
KeyCombo keyCombo = sc.getKeyComboByIndex(i);
if (keyCombo._key != 0)
{
// check if this stringified shortcut matches
string sc;
if (keyCombo._isCtrl)
sc += "Ctrl+";
if (keyCombo._isAlt)
sc += "Alt+";
if (keyCombo._isShift)
sc += "Shift+";
string keyString;
getKeyStrFromVal(keyCombo._key, keyString);
sc += keyString;
wstring combo_value = stringToLower(string2wstring(sc, CP_UTF8));
if (combo_value.find(_shortcutFilter) != std::string::npos)
return true;
}
}
return false;
} }
void ShortcutMapper::fillOutBabyGrid() void ShortcutMapper::fillOutBabyGrid()