jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-18 08:22:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor

Browse source
This commit is contained in:
RickyRister 2025-02-04 21:14:55 -08:00
parent 3fc1805942
commit f7bba2488b
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cockatrice/src/settings/shortcuts_settings.cpp
View file

@ -215,12 +215,11 @@ bool ShortcutsSettings::isValid(const QString &name, const QString &sequences) c
} }
/** /**
* Checks if the key or checkKey is a shortcut that is active in all windows * Checks if the shortcut is a shortcut that is active in all windows
*/ */
static bool isAlwaysActiveShortcut(const QString &key, const QString &checkKey) static bool isAlwaysActiveShortcut(const QString &shortcutName)
{ {
return key.startsWith("MainWindow") || checkKey.startsWith("MainWindow") || key.startsWith("Tabs") || return shortcutName.startsWith("MainWindow") || shortcutName.startsWith("Tabs");
checkKey.startsWith("Tabs");
} }
QStringList ShortcutsSettings::findOverlaps(const QString &name, const QString &sequences) const QStringList ShortcutsSettings::findOverlaps(const QString &name, const QString &sequences) const
@ -230,7 +229,7 @@ QStringList ShortcutsSettings::findOverlaps(const QString &name, const QString &
QStringList overlaps; QStringList overlaps;
for (const auto &key : shortCuts.keys()) { for (const auto &key : shortCuts.keys()) {
if (key.startsWith(checkKey) || isAlwaysActiveShortcut(key, checkKey)) { if (key.startsWith(checkKey) || isAlwaysActiveShortcut(key) || isAlwaysActiveShortcut(checkKey)) {
QString storedSequence = stringifySequence(shortCuts.value(key)); QString storedSequence = stringifySequence(shortCuts.value(key));
if (storedSequence.split(sep).contains(checkSequence)) { if (storedSequence.split(sep).contains(checkSequence)) {
overlaps.append(getShortcutFriendlyName(key)); overlaps.append(getShortcutFriendlyName(key));