openclaw/deskflow
1
0
Fork 0
Code Issues Pull Requests Actions 17 Packages Projects Releases Wiki Activity

refactor: KeyMap::keysToRestoreModifiers, use ranged for loops

Browse Source
This commit is contained in:
sithlord48
2025-07-25 11:56:54 -04:00
committed by Nick Bolton
parent 7785c954d5
commit 902f5823f2
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/lib/deskflow/KeyMap.cpp
View File

@ -780,29 +780,28 @@ bool KeyMap::keysToRestoreModifiers(
collectButtons(desiredModifiers, newKeys);
// release unwanted keys
for (ModifierToKeys::const_iterator i = oldModifiers.begin(); i != oldModifiers.end(); ++i) {
KeyButton button = i->second.m_button;
for (const auto &[_mask, _keyItem] : oldModifiers) {
KeyButton button = _keyItem.m_button;
if (button != keyItem.m_button && !newKeys.contains(button)) {
EKeystroke type = kKeystrokeRelease;
if (i->second.m_lock) {
if (_keyItem.m_lock) {
type = kKeystrokeUnmodify;
}
addKeystrokes(type, i->second, activeModifiers, currentState, keystrokes);
addKeystrokes(type, _keyItem, activeModifiers, currentState, keystrokes);
}
}
// press wanted keys
for (auto i = desiredModifiers.begin(); i != desiredModifiers.end(); ++i) {
const KeyButton button = i->second.m_button;
for (const auto &[_mask, _keyItem] : desiredModifiers) {
const KeyButton button = _keyItem.m_button;
if (button != keyItem.m_button && !oldKeys.contains(button)) {
EKeystroke type = kKeystrokePress;
if (i->second.m_lock) {
if (_keyItem.m_lock) {
type = kKeystrokeModify;
}
addKeystrokes(type, i->second, activeModifiers, currentState, keystrokes);
addKeystrokes(type, _keyItem, activeModifiers, currentState, keystrokes);
}
}
return true;
}