From f25c5dedd6be9a6ffd863dfc4590cc3e50696e07 Mon Sep 17 00:00:00 2001 From: Fritz Reichwald Date: Thu, 29 Dec 2016 00:21:42 +0100 Subject: [PATCH 1/3] First try for horizontal scrolling with mouse --- qutebrowser/browser/mouse.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/qutebrowser/browser/mouse.py b/qutebrowser/browser/mouse.py index db5055d51..9f9ed34fe 100644 --- a/qutebrowser/browser/mouse.py +++ b/qutebrowser/browser/mouse.py @@ -127,6 +127,12 @@ class MouseEventFilter(QObject): message.info("Zoom level: {}%".format(perc)) self._tab.zoom.set_factor(factor) + if e.modifiers() & Qt.ShiftModifier: + if e.anglelta().y() < 0: + self._tab.scroll.left() + else: + self._tab.scroll.right() + return False def _handle_context_menu(self, _e): From 643cf3f5788946010bdc8997985a9e5465d66c87 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 29 Dec 2016 00:38:52 +0100 Subject: [PATCH 2/3] Fix various small mouse scrolling issues --- qutebrowser/browser/mouse.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/qutebrowser/browser/mouse.py b/qutebrowser/browser/mouse.py index 9f9ed34fe..a1b56b96a 100644 --- a/qutebrowser/browser/mouse.py +++ b/qutebrowser/browser/mouse.py @@ -126,12 +126,12 @@ class MouseEventFilter(QObject): perc = int(100 * factor) message.info("Zoom level: {}%".format(perc)) self._tab.zoom.set_factor(factor) - - if e.modifiers() & Qt.ShiftModifier: - if e.anglelta().y() < 0: - self._tab.scroll.left() + elif e.modifiers() & Qt.ShiftModifier: + if e.angleDelta().y() > 0: + self._tab.scroller.left() else: - self._tab.scroll.right() + self._tab.scroller.right() + return True return False From 45ed0b3a16cb8a0df1be781cc4d64c7506139b61 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 29 Dec 2016 00:39:18 +0100 Subject: [PATCH 3/3] Update authors --- README.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.asciidoc b/README.asciidoc index 0560250b7..5fdb2c736 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -170,8 +170,8 @@ Contributors, sorted by the number of commits in descending order: * Nathan Isom * Thorsten Wißmann * Austin Anderson -* Jimmy * Fritz Reichwald +* Jimmy * Niklas Haas * Maciej Wołczyk * Spreadyy