Skip to content

Make Control-Scroll zooming controllable #1245

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

Merged
danirabbit merged 4 commits into from
Jan 15, 2023
Merged

Make Control-Scroll zooming controllable #1245

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d0f8a6
Emulate discrete scrolling for zooming
Jan 15, 2023
11cea30
Apply suggestions from code review
Jan 15, 2023
5ea9580
Merge branch 'master' into fix-ctrlscrollzoom
Jan 15, 2023
87c0ded
Use get_action_group
danirabbit Jan 15, 2023
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
18 changes: 13 additions & 5 deletions src/Widgets/SourceView.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ namespace Scratch.Widgets {
private SourceGutterRenderer git_diff_gutter_renderer;

private const uint THROTTLE_MS = 400;
private double total_delta = 0;
private const double SCROLL_THRESHOLD = 1.0;

public signal void style_changed (Gtk.SourceStyleScheme style);
public signal void selection_changed (Gtk.TextIter start_iter, Gtk.TextIter end_iter);
Expand Down Expand Up @@ -126,11 +128,17 @@ namespace Scratch.Widgets {
granite_settings.notify["prefers-color-scheme"].connect (restore_settings);

scroll_event.connect ((key_event) => {
if ((Gdk.ModifierType.CONTROL_MASK in key_event.state) && key_event.delta_y < 0) {
((Scratch.Application) GLib.Application.get_default ()).get_last_window ().action_zoom_in ();
return true;
} else if ((Gdk.ModifierType.CONTROL_MASK in key_event.state) && key_event.delta_y > 0) {
((Scratch.Application) GLib.Application.get_default ()).get_last_window ().action_zoom_out ();
var handled = false;
if (Gdk.ModifierType.CONTROL_MASK in key_event.state) {
total_delta += key_event.delta_y;
if (total_delta < -SCROLL_THRESHOLD) {
get_action_group (MainWindow.ACTION_GROUP).activate_action (MainWindow.ACTION_ZOOM_IN, null);
total_delta = 0.0;
} else if (total_delta > SCROLL_THRESHOLD) {
get_action_group (MainWindow.ACTION_GROUP).activate_action (MainWindow.ACTION_ZOOM_OUT, null);
total_delta = 0.0;
}

return true;
}

Expand Down