From a8355022dbfc0aa7c9fa74da7c80c49bfce9adf9 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 25 Sep 2018 20:39:42 +0200 Subject: [PATCH] Pass through Ctrl+Mousewheel in passthrough mode See #3836 --- doc/changelog.asciidoc | 2 ++ qutebrowser/browser/mouse.py | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc index ae171b5c9..0602a5434 100644 --- a/doc/changelog.asciidoc +++ b/doc/changelog.asciidoc @@ -66,6 +66,8 @@ Changed - The `content.autoplay` setting now supports URL patterns on Qt >= 5.11. - The `content.host_blocking.whitelist` setting now takes a list of URL patterns instead of globs. +- In passthrough mode, Ctrl + Mousewheel now also gets passed through to the + page instead of zooming. Fixed ~~~~~ diff --git a/qutebrowser/browser/mouse.py b/qutebrowser/browser/mouse.py index 24ced7d47..4667471fc 100644 --- a/qutebrowser/browser/mouse.py +++ b/qutebrowser/browser/mouse.py @@ -141,6 +141,10 @@ class MouseEventFilter(QObject): return True if e.modifiers() & Qt.ControlModifier: + mode = modeman.instance(self._tab.win_id).mode + if mode == usertypes.KeyMode.passthrough: + return False + divider = config.val.zoom.mouse_divider if divider == 0: return False