diff --git a/terminatorlib/config.py b/terminatorlib/config.py index be0fa223..66f82ae9 100644 --- a/terminatorlib/config.py +++ b/terminatorlib/config.py @@ -118,7 +118,6 @@ DEFAULTS = { 'title_font' : 'Sans 9', 'putty_paste_style' : False, 'smart_copy' : True, - 'disable_mousewheel_zoom': False, }, 'keybindings': { 'zoom_in' : 'plus', @@ -222,6 +221,7 @@ DEFAULTS = { 'scroll_on_output' : False, 'scrollback_lines' : 500, 'scrollback_infinite' : False, + 'disable_mousewheel_zoom': False, 'exit_action' : 'close', 'palette' : '#2e3436:#cc0000:#4e9a06:#c4a000:\ #3465a4:#75507b:#06989a:#d3d7cf:#555753:#ef2929:#8ae234:#fce94f:\ diff --git a/terminatorlib/preferences.glade b/terminatorlib/preferences.glade index 487de81c..3567fb34 100644 --- a/terminatorlib/preferences.glade +++ b/terminatorlib/preferences.glade @@ -552,24 +552,6 @@ 2 - - - Disable Ctrl+mousewheel zoom - False - True - True - False - 0.5 - True - True - - - - 0 - 7 - 2 - - True @@ -1644,6 +1626,23 @@ 5 + + + Disable Ctrl+mousewheel zoom + False + True + True + False + 0.5 + True + + + + False + False + 6 + + True @@ -1682,7 +1681,7 @@ False True - 6 + 7 diff --git a/terminatorlib/terminal.py b/terminatorlib/terminal.py index bbb06696..e8212197 100644 --- a/terminatorlib/terminal.py +++ b/terminatorlib/terminal.py @@ -972,12 +972,13 @@ class Terminal(Gtk.VBox): def on_mousewheel(self, widget, event): """Handler for modifier + mouse wheel scroll events""" - if self.config["disable_mousewheel_zoom"] is True: - return (True) SMOOTH_SCROLL_UP = event.direction == Gdk.ScrollDirection.SMOOTH and event.delta_y <= 0. SMOOTH_SCROLL_DOWN = event.direction == Gdk.ScrollDirection.SMOOTH and event.delta_y > 0. if event.state & Gdk.ModifierType.CONTROL_MASK == Gdk.ModifierType.CONTROL_MASK: - # Ctrl + mouse wheel up/down with Shift and Super additions + # Zoom the terminal(s) in or out if not disabled in config + if self.config["disable_mousewheel_zoom"] is True: + return (False) + # Choice of target terminals depends on Shift and Super modifiers if event.state & Gdk.ModifierType.MOD4_MASK == Gdk.ModifierType.MOD4_MASK: targets=self.terminator.terminals elif event.state & Gdk.ModifierType.SHIFT_MASK == Gdk.ModifierType.SHIFT_MASK: