Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-15 16:26:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

apprt/gtk: correct new tab button click function signature

Browse Source 
Fixes #674

We were incorrectly reusing the action activate signal callback for the
button click. These have different function signatures.
This commit is contained in:
Mitchell Hashimoto
2023-11-04 16:57:01 -07:00
parent 06a469fc4b
commit ebd57f6bbc
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/apprt/gtk/Window.zig
View File

@ -88,7 +88,7 @@ pub fn init(self: *Window, app: *App) !void {
const btn = c.gtk_button_new_from_icon_name("tab-new-symbolic"); const btn = c.gtk_button_new_from_icon_name("tab-new-symbolic");
c.gtk_widget_set_tooltip_text(btn, "New Tab"); c.gtk_widget_set_tooltip_text(btn, "New Tab");
c.gtk_header_bar_pack_end(@ptrCast(header), btn); c.gtk_header_bar_pack_end(@ptrCast(header), btn);
_ = c.g_signal_connect_data(btn, "clicked", c.G_CALLBACK(&gtkActionNewTab), self, null, c.G_CONNECT_DEFAULT); _ = c.g_signal_connect_data(btn, "clicked", c.G_CALLBACK(&gtkTabNewClick), self, null, c.G_CONNECT_DEFAULT);
} }
} else { } else {
// Hide window decoration if configured. This has to happen before // Hide window decoration if configured. This has to happen before
@ -352,6 +352,17 @@ fn gtkTabCloseClick(_: *c.GtkButton, ud: ?*anyopaque) callconv(.C) void {
surface.core_surface.close(); surface.core_surface.close();
} }
// Note: we MUST NOT use the GtkButton parameter because gtkActionNewTab
// sends an undefined value.
fn gtkTabNewClick(_: *c.GtkButton, ud: ?*anyopaque) callconv(.C) void {
const self: *Window = @ptrCast(@alignCast(ud orelse return));
const surface = self.actionSurface() orelse return;
_ = surface.performBindingAction(.{ .new_tab = {} }) catch |err| {
log.warn("error performing binding action error={}", .{err});
return;
};
}
fn gtkPageAdded( fn gtkPageAdded(
_: *c.GtkNotebook, _: *c.GtkNotebook,
child: *c.GtkWidget, child: *c.GtkWidget,
@ -549,12 +560,8 @@ fn gtkActionNewTab(
_: *c.GVariant, _: *c.GVariant,
ud: ?*anyopaque, ud: ?*anyopaque,
) callconv(.C) void { ) callconv(.C) void {
const self: *Window = @ptrCast(@alignCast(ud orelse return)); // We can use undefined because the button is not used.
const surface = self.actionSurface() orelse return; gtkTabNewClick(undefined, ud);
_ = surface.performBindingAction(.{ .new_tab = {} }) catch |err| {
log.warn("error performing binding action error={}", .{err});
return;
};
} }
fn gtkActionToggleInspector( fn gtkActionToggleInspector(