diff options
| author | Florian Bruhin <git@the-compiler.org> | 2017-02-22 05:15:57 +0100 |
|---|---|---|
| committer | Florian Bruhin <git@the-compiler.org> | 2017-02-22 05:15:57 +0100 |
| commit | e8443241df0da7fb78cceccaafd6c856fcd850dd (patch) | |
| tree | e545f7ef0eef68622b686baf34241d89463cc902 | |
| parent | 77f475991d75dd3abff9906918efe9ad202bfd9d (diff) | |
| download | qutebrowser-e8443241df0da7fb78cceccaafd6c856fcd850dd.tar.gz qutebrowser-e8443241df0da7fb78cceccaafd6c856fcd850dd.zip | |
Allow input -> mouse-zoom-divider to be 0
| -rw-r--r-- | CHANGELOG.asciidoc | 1 | ||||
| -rw-r--r-- | qutebrowser/browser/mouse.py | 2 | ||||
| -rw-r--r-- | qutebrowser/config/configdata.py | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 381d20842..851c68cbc 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -44,6 +44,7 @@ Changed - Zoom level messages are now not stacked on top of each other anymore. - qutebrowser now automatically uses QtWebEngine if QtWebKit is unavailable - :history-clear now asks for a confirmation, unless it's run with --force. +- `input -> mouse-zoom-divider` can now be 0 to disable zooming by mouse wheel Fixed ----- diff --git a/qutebrowser/browser/mouse.py b/qutebrowser/browser/mouse.py index 247c31a6d..79b6816bb 100644 --- a/qutebrowser/browser/mouse.py +++ b/qutebrowser/browser/mouse.py @@ -120,6 +120,8 @@ class MouseEventFilter(QObject): if e.modifiers() & Qt.ControlModifier: divider = config.get('input', 'mouse-zoom-divider') + if divider == 0: + return False factor = self._tab.zoom.factor() + (e.angleDelta().y() / divider) if factor < 0: return False diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py index 0180537b0..cb4d260b8 100644 --- a/qutebrowser/config/configdata.py +++ b/qutebrowser/config/configdata.py @@ -589,7 +589,7 @@ def data(readonly=False): "disables the context menu."), ('mouse-zoom-divider', - SettingValue(typ.Int(minval=1), '512'), + SettingValue(typ.Int(minval=0), '512'), "How much to divide the mouse wheel movements to translate them " "into zoom increments."), |