superrob1500
/
mirror-ghostty
mirror of https://github.com/ghostty-org/ghostty
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge b5f5ca0789 into 6246c288ae

pull/12659/merge
00JCIV00 2026-06-02 15:46:12 -03:00 committed by GitHub
parent 6246c288ae b5f5ca0789
commit 9ee06f3b16
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 49 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/apprt/gtk/class/surface.zig
View File

@ -3030,37 +3030,56 @@ pub const Surface = extern struct {
) callconv(.c) c_int {
const priv: *Private = self.private();
switch (ec.getUnit()) {
.surface => {},
.wheel => return @intFromBool(false),
else => return @intFromBool(false),
}
// Check if horizontal tab scrolling is enabled and this is a
// touchpad surface scroll. If not, forward to the terminal.
const tab_scroll_enabled = if (priv.config) |config|
config.get().@"gtk-horizontal-tab-scroll"
else
true;
priv.pending_horizontal_scroll += x;
const is_surface_scroll = ec.getUnit() == .surface;
if (tab_scroll_enabled and is_surface_scroll) {
priv.pending_horizontal_scroll += x;
if (@abs(priv.pending_horizontal_scroll) < 120) {
if (priv.pending_horizontal_scroll_reset) |v| {
_ = glib.Source.remove(v);
priv.pending_horizontal_scroll_reset = null;
}
priv.pending_horizontal_scroll_reset = glib.timeoutAdd(500, ecMouseScrollHorizontalReset, self);
return @intFromBool(true);
}
_ = self.as(gtk.Widget).activateAction(
if (priv.pending_horizontal_scroll < 0.0)
"tab.next-page"
else
"tab.previous-page",
null,
);
if (@abs(priv.pending_horizontal_scroll) < 120) {
if (priv.pending_horizontal_scroll_reset) |v| {
_ = glib.Source.remove(v);
priv.pending_horizontal_scroll_reset = null;
}
priv.pending_horizontal_scroll_reset = glib.timeoutAdd(500, ecMouseScrollHorizontalReset, self);
priv.pending_horizontal_scroll = 0.0;
return @intFromBool(true);
}
_ = self.as(gtk.Widget).activateAction(
if (priv.pending_horizontal_scroll < 0.0)
"tab.next-page"
else
"tab.previous-page",
null,
);
if (priv.pending_horizontal_scroll_reset) |v| {
_ = glib.Source.remove(v);
priv.pending_horizontal_scroll_reset = null;
}
priv.pending_horizontal_scroll = 0.0;
// Forward horizontal scroll to the terminal (e.g. for neovim).
const surface = priv.core_surface orelse return @intFromBool(false);
const scaled = self.scaledCoordinates(x, 0);
surface.scrollCallback(
scaled.x * -1,
0,
.{},
) catch |err| {
log.warn("error in scroll callback err={}", .{err});
return @intFromBool(false);
};
return @intFromBool(true);
}

8
src/config/Config.zig
View File

@ -3657,6 +3657,14 @@ else
/// which is the old style.
@"gtk-wide-tabs": bool = true,
/// If `true` (default), then two-finger horizontal scrolling on a touchpad
/// will switch between tabs. Scrolling left goes to the next tab and
/// scrolling right goes to the previous tab. Set this to `false` to
/// disable this behavior.
///
/// Available since 1.4.0.
@"gtk-horizontal-tab-scroll": bool = true,
/// Custom CSS files to be loaded.
///
/// GTK CSS documentation can be found at the following links: