Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added option to disable ctrl+mousewheel zoom #46

Merged
merged 4 commits into from
Jun 3, 2020
Merged

Added option to disable ctrl+mousewheel zoom #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e4160dd
Added option to disable ctrl+mousewheel zoom
filipkilibarda Apr 29, 2020
a7bd53a
Fixed issues with mousewheel zoom PR
filipkilibarda Apr 29, 2020
425323c
Merge remote-tracking branch 'upstream/master' into HEAD
filipkilibarda Apr 29, 2020
c82b921
Merge with upstream
filipkilibarda Apr 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions terminatorlib/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@
'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:\
Expand Down
19 changes: 18 additions & 1 deletion terminatorlib/preferences.glade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1626,6 +1626,23 @@
<property name="position">5</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="disablemousewheelzoom">
<property name="label" translatable="yes">Disable Ctrl+mousewheel zoom</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_disable_mousewheel_zoom_toggled" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">6</property>
</packing>
</child>
<child>
<object class="GtkBox" id="word_chars_hbox">
<property name="visible">True</property>
Expand Down Expand Up @@ -1664,7 +1681,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">6</property>
<property name="position">7</property>
</packing>
</child>
</object>
Expand Down
8 changes: 8 additions & 0 deletions terminatorlib/prefseditor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,9 @@ def set_values(self):
else:
active = 1
widget.set_active(active)
# Disable Ctrl+mousewheel zoom
widget = guiget('disablemousewheelzoom')
widget.set_active(self.config['disable_mousewheel_zoom'])
# scroll_tabbar
widget = guiget('scrolltabbarcheck')
widget.set_active(self.config['scroll_tabbar'])
Expand Down Expand Up @@ -695,6 +698,11 @@ def on_dbuscheck_toggled(self, widget):
self.config['dbus'] = widget.get_active()
self.config.save()

def on_disable_mousewheel_zoom_toggled(self, widget):
"""Ctrl+mousewheel zoom setting changed"""
self.config['disable_mousewheel_zoom'] = widget.get_active()
self.config.save()

def on_winbordercheck_toggled(self, widget):
"""Window border setting changed"""
self.config['borderless'] = not widget.get_active()
Expand Down
5 changes: 4 additions & 1 deletion terminatorlib/terminal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -975,7 +975,10 @@ def on_mousewheel(self, widget, event):
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:
Expand Down