kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Gui: fix shortcut context handling in ShortcutManager

Browse Source 
Related #6097

Qt ignores shortcut of actions in invisible toolbar, but not for actions
in a hidden menu action of menu bar, which is likely a Qt bug. The
desired behavior should be that of toolbar actions, so that actions
belong to different workbenches can have the same shortcut without
conflict.

This commit works around this inconsistency by ensuring only the active
actions are added in menu bar. In addition, all active actions will be
added to a zero sized child widget of the main window, which ensures the
shortcuts of these actions being active regardless whether the action is
in toolbar or menu bar, visible or not.
This commit is contained in:
Zheng, Lei
2022-03-14 16:28:18 +08:00
committed by wwmayer
parent b48458673c
commit 7458912b33
5 changed files with 61 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/Gui/ShortcutManager.cpp
View File

@@ -203,37 +203,35 @@ bool ShortcutManager::checkShortcut(QObject *o, const QKeySequence &key)
if (iter == index.end())
return false;
auto it = iter;
// skip to the first not exact matched key
for (; it != index.end() && key == it->key.shortcut; ++it);
// disable and enqueue the action in order to try other alternativeslll
action->setEnabled(false);
pendingActions.emplace_back(action, key.count(), 0);
// check for potential partial match, i.e. longer key sequences
bool flush = true;
for (; it != index.end(); ++it) {
bool found = false;
for (auto it = iter; it != index.end(); ++it) {
if (key.matches(it->key.shortcut) == QKeySequence::NoMatch)
break;
if (it->action && it->action->isEnabled()) {
if (action == it->action) {
// There maybe more than one action with the exact same shortcut.
// However, we only disable and enqueue the triggered action.
// Because, QAction::isEnabled() does not check if the action is
// active under its current ShortcutContext. We would have to check
// its parent widgets visibility which may or may not be reliable.
// Instead, we rely on QEvent::Shortcut to be sure to enqueue only
// active shortcuts. We'll fake the current key sequence below,
// which will trigger all possible matches one by one.
pendingActions.back().priority = getPriority(it->key.name);
found = true;
}
else if (it->action && it->action->isEnabled()) {
flush = false;
break;
if (found)
break;
}
}
int count = 0;
for (it = iter; it != index.end() && key == it->key.shortcut; ++it) {
if (it->action && it->action->isEnabled()) {
if (!flush) {
// temporary disable the action so that we can try potential
// match with further keystrokes.
it->action->setEnabled(false);
}
pendingActions.emplace_back(it->action, key.count(), getPriority(it->key.name));
++count;
}
}
if (!count) {
// action not found in the map, shouldn't happen!
pendingActions.emplace_back(action, key.count(), 0);
}
if (flush) {
// We'll flush now because there is no potential match with further
// keystrokes, so no need to wait for timer.