tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-26 23:34:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix ShortcutMapper displays wrong shortcut while editing regression (from v8.7.6)

Browse Source 
Fix double clicking chosen command in ShortcutMapper displays wrong shortcut due to the bad index.

- there was off-by-1 when building the oemVkUsedIDs vector, which was caused by using the index based on .size() instead of .size()-1 to get the most-recently-added.
- also cleared the vector each launch of the dialog, because the .push_back() was causing the vector to grow without bounds, messing up the indexing on subsequent runs of the dialog, causing it to pick _none_ of the entries.

The regression was introduced by:
6dfbc1f7e8

Fix #16491, close #16492
This commit is contained in:
PeterCJ 2025-04-30 15:33:55 -07:00 committed by Don Ho
parent 19e356d616
commit 30976ec8d2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PowerEditor/src/WinControls/shortcut/shortcut.cpp
View File

@ -553,6 +553,7 @@ intptr_t CALLBACK Shortcut::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPar
// while buiding the IDC_KEY_COMBO keys, update the map to which VirtualKey is used for each index // while buiding the IDC_KEY_COMBO keys, update the map to which VirtualKey is used for each index
int iFound = -1; int iFound = -1;
oemVkUsedIDs.clear(); // the logic below (always pushing onto the vector) requires that it starts fresh every time, otherwise it will grow every time the dialog is launched
for (size_t i = 0 ; i < nbKeys ; ++i) for (size_t i = 0 ; i < nbKeys ; ++i)
{ {
const char* nameStr = namedKeyArray[i].name; const char* nameStr = namedKeyArray[i].name;
@ -571,7 +572,7 @@ intptr_t CALLBACK Shortcut::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPar
} }
if (_keyCombo._key == namedKeyArray[i].id) if (_keyCombo._key == namedKeyArray[i].id)
iFound = static_cast<int32_t>(oemVkUsedIDs.size()); iFound = static_cast<int32_t>(oemVkUsedIDs.size())-1; // -1 because it's already been added, so the most recent index of oemVkUsedIDs is 1 less than the length
} }
if (iFound != -1) if (iFound != -1)
@ -1243,6 +1244,7 @@ intptr_t CALLBACK ScintillaKeyMap::run_dlgProc(UINT Message, WPARAM wParam, LPAR
::SetDlgItemText(_hSelf, IDC_NAME_EDIT, string2wstring(_name, CP_UTF8).c_str()); ::SetDlgItemText(_hSelf, IDC_NAME_EDIT, string2wstring(_name, CP_UTF8).c_str());
_keyCombo = _keyCombos[0]; _keyCombo = _keyCombos[0];
oemVkUsedIDs.clear(); // the logic below (always pushing onto the vector) requires that it starts fresh every time, otherwise it will grow every time the dialog is launched
for (size_t i = 0 ; i < nbKeys ; ++i) for (size_t i = 0 ; i < nbKeys ; ++i)
{ {