summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2021-07-06 16:32:13 +0200
committerFlorian Bruhin <me@the-compiler.org>2021-07-06 16:32:13 +0200
commitac849d186e36aa5f25ebded68ff4bbdab930afcc (patch)
tree6b9a7cdc3b21b379fc7cce89497c9973eb05ff24
parentefeeaa2826cab401f82d64d6ee6bbb7407abfe9d (diff)
parenta6a7691f28b10c92886d0bda8fb6ef5d068634f1 (diff)
downloadqutebrowser-ac849d186e36aa5f25ebded68ff4bbdab930afcc.tar.gz
qutebrowser-ac849d186e36aa5f25ebded68ff4bbdab930afcc.zip
Merge remote-tracking branch 'origin/pr/6580'
-rw-r--r--qutebrowser/mainwindow/tabwidget.py16
1 files changed, 15 insertions, 1 deletions
diff --git a/qutebrowser/mainwindow/tabwidget.py b/qutebrowser/mainwindow/tabwidget.py
index 4041de2c9..7983127d5 100644
--- a/qutebrowser/mainwindow/tabwidget.py
+++ b/qutebrowser/mainwindow/tabwidget.py
@@ -705,7 +705,21 @@ class TabBar(QTabBar):
e: The QWheelEvent
"""
if config.val.tabs.mousewheel_switching:
- super().wheelEvent(e)
+ if utils.is_mac:
+ # WORKAROUND for this not being customizable until Qt 6:
+ # https://codereview.qt-project.org/c/qt/qtbase/+/327746
+ index = self.currentIndex()
+ if index == -1:
+ return
+ dx = e.angleDelta().x()
+ dy = e.angleDelta().y()
+ delta = dx if abs(dx) > abs(dy) else dy
+ offset = -1 if delta > 0 else 1
+ index += offset
+ if 0 <= index < self.count():
+ self.setCurrentIndex(index)
+ else:
+ super().wheelEvent(e)
else:
tabbed_browser = objreg.get('tabbed-browser', scope='window',
window=self._win_id)