summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <git@the-compiler.org>2018-03-05 22:33:16 +0100
committerFlorian Bruhin <git@the-compiler.org>2018-03-05 22:33:16 +0100
commit78f6ad14c2f2df3b09fc1eca68a901412ea5cdf9 (patch)
treed41f45f164c85c2ec42600f7d68f343c4931500e
parent3b957c5f2e78eca94763c9a49877530e5f1c1334 (diff)
downloadqutebrowser-78f6ad14c2f2df3b09fc1eca68a901412ea5cdf9.tar.gz
qutebrowser-78f6ad14c2f2df3b09fc1eca68a901412ea5cdf9.zip
Use Qt.KeyboardModifierMask
-rw-r--r--qutebrowser/keyinput/keyutils.py12
1 files changed, 5 insertions, 7 deletions
diff --git a/qutebrowser/keyinput/keyutils.py b/qutebrowser/keyinput/keyutils.py
index f40314709..d89f9aa5c 100644
--- a/qutebrowser/keyinput/keyutils.py
+++ b/qutebrowser/keyinput/keyutils.py
@@ -344,13 +344,11 @@ class KeySequence:
def __iter__(self):
"""Iterate over KeyInfo objects."""
- modifier_mask = int(Qt.ShiftModifier | Qt.ControlModifier |
- Qt.AltModifier | Qt.MetaModifier |
- Qt.KeypadModifier | Qt.GroupSwitchModifier)
- for key in self._iter_keys():
- yield KeyInfo(
- key=int(key) & ~modifier_mask,
- modifiers=Qt.KeyboardModifiers(int(key) & modifier_mask))
+ for key_and_modifiers in self._iter_keys():
+ key = int(key_and_modifiers) & ~Qt.KeyboardModifierMask
+ modifiers = Qt.KeyboardModifiers(int(key_and_modifiers) &
+ Qt.KeyboardModifierMask)
+ yield KeyInfo(key=key, modifiers=modifiers)
def __repr__(self):
return utils.get_repr(self, keys=str(self))