itdominator
/
terminator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #609 from Vulcalien/mousewheel-modifiers 

Terminal ctrl+mousewheel: do not try to zoom if shift is pressed
This commit is contained in:
Matt Rose 2022-06-27 15:31:02 -04:00 committed by GitHub
parent d33c145ba8 784dc4946e
commit 7b39058b0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
terminatorlib/terminal.py
View File

@ -1006,7 +1006,9 @@ class Terminal(Gtk.VBox):
"""Handler for modifier + mouse wheel scroll events""" """Handler for modifier + mouse wheel scroll events"""
SMOOTH_SCROLL_UP = event.direction == Gdk.ScrollDirection.SMOOTH and event.delta_y <= 0. 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. SMOOTH_SCROLL_DOWN = event.direction == Gdk.ScrollDirection.SMOOTH and event.delta_y > 0.
if event.state & Gdk.ModifierType.CONTROL_MASK == Gdk.ModifierType.CONTROL_MASK:
modifiers = event.state & (Gdk.ModifierType.CONTROL_MASK | Gdk.ModifierType.SHIFT_MASK)
if modifiers == Gdk.ModifierType.CONTROL_MASK:
# Zoom the terminal(s) in or out if not disabled in config # Zoom the terminal(s) in or out if not disabled in config
if self.config["disable_mousewheel_zoom"] is True: if self.config["disable_mousewheel_zoom"] is True:
return False return False
@ -1025,7 +1027,7 @@ class Terminal(Gtk.VBox):
for target in targets: for target in targets:
target.zoom_out() target.zoom_out()
return True return True
if event.state & Gdk.ModifierType.SHIFT_MASK == Gdk.ModifierType.SHIFT_MASK: elif modifiers == Gdk.ModifierType.SHIFT_MASK:
# Shift + mouse wheel up/down # Shift + mouse wheel up/down
if event.direction == Gdk.ScrollDirection.UP or SMOOTH_SCROLL_UP: if event.direction == Gdk.ScrollDirection.UP or SMOOTH_SCROLL_UP:
self.scroll_by_page(-1) self.scroll_by_page(-1)