diff options
author | Florian Bruhin <me@the-compiler.org> | 2020-04-20 12:27:15 +0200 |
---|---|---|
committer | Florian Bruhin <me@the-compiler.org> | 2020-04-20 12:27:15 +0200 |
commit | a0d6e3628c3ac9b19846969a15792c43e9a6235c (patch) | |
tree | 9a11273d6fb970bc783b12fb9e443ef5a155c8b2 | |
parent | 2fdc7a87c5672cd2e5706dc5d81c6230396b20c5 (diff) | |
download | qutebrowser-a0d6e3628c3ac9b19846969a15792c43e9a6235c.tar.gz qutebrowser-a0d6e3628c3ac9b19846969a15792c43e9a6235c.zip |
Disable older workarounds in TabEventFilter
- Horizontal scrolling with Shift is only needed with Qt 5.7.
With Qt 5.9, it's handled by QtWebEngine.
- The autorepeat workaround is only needed until Qt 5.14.
- The checks should use compiled=False because we don't care about API.
-rw-r--r-- | qutebrowser/browser/eventfilter.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/qutebrowser/browser/eventfilter.py b/qutebrowser/browser/eventfilter.py index 42eaa0b02..1cd0f6513 100644 --- a/qutebrowser/browser/eventfilter.py +++ b/qutebrowser/browser/eventfilter.py @@ -177,7 +177,8 @@ class TabEventFilter(QObject): perc = int(100 * factor) message.info("Zoom level: {}%".format(perc), replace=True) self._tab.zoom.set_factor(factor) - elif e.modifiers() & Qt.ShiftModifier: + elif (e.modifiers() & Qt.ShiftModifier and + not qtutils.version_check('5.9', compiled=False)): if e.angleDelta().y() > 0: self._tab.scroller.left() else: @@ -209,7 +210,8 @@ class TabEventFilter(QObject): True if the event should be filtered, False otherwise. """ return (e.isAutoRepeat() and - qtutils.version_check('5.10') and + qtutils.version_check('5.10', compiled=False) and + not qtutils.version_check('5.14', compiled=False) and objects.backend == usertypes.Backend.QtWebEngine) def _mousepress_insertmode_cb(self, elem): |