Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-08-02 14:57:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

code review:

Browse Source 
- move responses definition to the blueprint, use translatable strings
- minor changes in the response callback
This commit is contained in:
Maciej Bartczak
2025-02-22 13:05:02 +01:00
committed by Jeffrey C. Ollie
parent 1ee8dfc99c
commit 8758295647
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/apprt/gtk/Surface.zig
View File

@ -8,7 +8,6 @@ const adw = @import("adw");
const gtk = @import("gtk");
const gio = @import("gio");
const gobject = @import("gobject");
const glib = @import("glib");
const Allocator = std.mem.Allocator;
const build_config = @import("../../build_config.zig");
const build_options = @import("build_options");
@ -1026,14 +1025,10 @@ pub fn promptTitle(self: *Surface) !void {
var builder = Builder.init("prompt-title-dialog", .blp);
defer builder.deinit();
const dialog: *adw.AlertDialog = @ptrCast(builder.getObject("prompt_title_dialog"));
dialog.addResponse("cancel", "Cancel");
dialog.addResponse("ok", "OK");
dialog.setResponseAppearance("ok", adw.ResponseAppearance.suggested);
const entry: *gtk.Entry = @ptrCast(builder.getObject("title_entry"));
entry.getBuffer().setText(self.getTitle() orelse "", -1);
const dialog: *adw.AlertDialog = @ptrCast(builder.getObject("prompt_title_dialog"));
dialog.choose(@ptrCast(window.window), null, &gtkPromptTitleResponse, self);
}
@ -2329,14 +2324,16 @@ fn gtkPromptTitleResponse(source_object: ?*gobject.Object, result: *gio.AsyncRes
const self = userdataSelf(ud.?);
const response = dialog.chooseFinish(result);
if (glib.strEqual("ok", response) != 0) {
const title_entry: *gtk.Entry = @ptrCast(dialog.getExtraChild());
if (std.mem.orderZ(u8, "ok", response) == .eq) {
const title_entry: *gtk.Entry = gobject.ext.cast(gtk.Entry, dialog.getExtraChild().?).?;
const title = std.mem.span(title_entry.getBuffer().getText());
// if the new title is empty and the user has set the title previously, restore the terminal provided title
if (title.len == 0 and self.title_from_terminal != null) {
if (title.len == 0) {
if (self.getTerminalTitle()) |terminal_title| {
self.setTitle(terminal_title, .user) catch {};
self.setTitle(terminal_title, .user) catch |err| {
log.err("Failed to set title: {}", .{err});
};
self.app.core_app.alloc.free(self.title_from_terminal.?);
self.title_from_terminal = null;
}
@ -2346,15 +2343,14 @@ fn gtkPromptTitleResponse(source_object: ?*gobject.Object, result: *gio.AsyncRes
self.title_from_terminal = self.app.core_app.alloc.dupeZ(u8, self.title_text.?) catch |err| switch (err) {
error.OutOfMemory => {
log.err("Failed to allocate memory for title: {}", .{err});
c.gtk_window_destroy(@ptrCast(dialog));
return;
},
};
}
self.setTitle(title, .user) catch {};
self.setTitle(title, .user) catch |err| {
log.err("Failed to set title: {}", .{err});
};
}
}
c.gtk_window_destroy(@ptrCast(dialog));
}

8
src/apprt/gtk/ui/prompt-title-dialog.blp
View File

@ -2,8 +2,12 @@ using Gtk 4.0;
using Adw 1;
Adw.AlertDialog prompt_title_dialog {
heading: "Change Terminal Title";
body: "Leave blank to restore the default title.";
heading: _("Change Terminal Title");
body: _("Leave blank to restore the default title.");
responses [
cancel: _("Cancel"),
ok: _("OK") suggested
]
focus-widget: title_entry;
extra-child: Entry title_entry {};