Differential D26859 Diff 74220 modifier_only_shortcuts.cpp

Changeset View

Standalone View

View Options

modifier_only_shortcuts.cpp

Show First 20 Lines • Show All 53 Lines • ▼ Show 20 Line(s)50 if (wasEmpty && m_pressedKeys.size() == 1 &&
54 m_modifier = Qt::KeyboardModifier(int(event->modifiersRelevantForGlobalShortcuts())); 54​ m_modifier = Qt::KeyboardModifier(int(event->modifiersRelevantForGlobalShortcuts()));
55 } else { 55​ } else {
56 m_modifier = Qt::NoModifier; 56​ m_modifier = Qt::NoModifier;
57 } 57​ }
58 } else if (!m_pressedKeys.isEmpty()) { 58​ } else if (!m_pressedKeys.isEmpty()) {
59 m_pressedKeys.remove(event->nativeScanCode()); 59​ m_pressedKeys.remove(event->nativeScanCode());
60 if (m_pressedKeys.isEmpty() && 60​ if (m_pressedKeys.isEmpty() &&
61 event->modifiersRelevantForGlobalShortcuts() == Qt::NoModifier && 61​ event->modifiersRelevantForGlobalShortcuts() == Qt::NoModifier &&
62 !workspace()->globalShortcutsDisabled()) { 62​ workspace() && !workspace()->globalShortcutsDisabled()) {
davidedmundsonUnsubmitted
Not Done

seems unrelated but I assume this is fixing a teardown crash?

davidedmundson: seems unrelated but I assume this is fixing a teardown crash?
63 if (m_modifier != Qt::NoModifier) { 63​ if (m_modifier != Qt::NoModifier) {
64 const auto list = options->modifierOnlyDBusShortcut(m_modifier); 64​ const auto list = options->modifierOnlyDBusShortcut(m_modifier);
65 if (list.size() >= 4) { 65​ if (list.size() >= 4) {
66 auto call = QDBusMessage::createMethodCall(list.at(0), list.at(1), list.at(2), list.at(3)); 66​ auto call = QDBusMessage::createMethodCall(list.at(0), list.at(1), list.at(2), list.at(3));
67 QVariantList args; 67​ QVariantList args;
68 for (int i = 4; i < list.size(); ++i) { 68​ for (int i = 4; i < list.size(); ++i) {
69 args << list.at(i); 69​ args << list.at(i);
70 } 70​ }
Show All 32 Lines