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

apprt/gtk: destory the inspector properly on close

Browse Source
This commit is contained in:
Mitchell Hashimoto
2023-10-20 08:51:34 -07:00
parent 6a50a938d6
commit 522d6b8ba1
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -297,7 +297,7 @@ pub fn controlInspector(self: *Surface, mode: input.InspectorMode) void {
if (!show) { if (!show) {
if (self.inspector) |v| { if (self.inspector) |v| {
v.close(true); v.close();
self.inspector = null; self.inspector = null;
} }

13
src/apprt/gtk/inspector.zig
View File

@ -26,7 +26,7 @@ pub const Inspector = struct {
/// location is closed. For example: set this to true, request the /// location is closed. For example: set this to true, request the
/// window be closed, let GTK do its cleanup, then note this to destroy /// window be closed, let GTK do its cleanup, then note this to destroy
/// the inner state. /// the inner state.
request_destroy: bool = false, destroy_on_close: bool = true,
/// Location where the inspector will be launched. /// Location where the inspector will be launched.
pub const Location = union(LocationKey) { pub const Location = union(LocationKey) {
@ -63,6 +63,7 @@ pub const Inspector = struct {
pub fn destroy(self: *Inspector) void { pub fn destroy(self: *Inspector) void {
assert(self.location == .hidden); assert(self.location == .hidden);
const alloc = self.allocator(); const alloc = self.allocator();
self.surface.inspector = null;
self.deinit(); self.deinit();
alloc.destroy(self); alloc.destroy(self);
} }
@ -83,10 +84,8 @@ pub const Inspector = struct {
_ = self; _ = self;
} }
/// Request the inspector is closed. If request_destroy is true, also /// Request the inspector is closed.
/// destroy the inspector state when the GUI is closed. pub fn close(self: *Inspector) void {
pub fn close(self: *Inspector, request_destroy: bool) void {
self.request_destroy = request_destroy;
switch (self.location) { switch (self.location) {
.hidden => self.locationDidClose(), .hidden => self.locationDidClose(),
.window => |v| v.close(), .window => |v| v.close(),
@ -95,7 +94,7 @@ pub const Inspector = struct {
fn locationDidClose(self: *Inspector) void { fn locationDidClose(self: *Inspector) void {
self.location = .{ .hidden = {} }; self.location = .{ .hidden = {} };
if (self.request_destroy) self.destroy(); if (self.destroy_on_close) self.destroy();
} }
fn allocator(self: *const Inspector) Allocator { fn allocator(self: *const Inspector) Allocator {
@ -129,7 +128,7 @@ const Window = struct {
const gtk_window: *c.GtkWindow = @ptrCast(window); const gtk_window: *c.GtkWindow = @ptrCast(window);
errdefer c.gtk_window_destroy(gtk_window); errdefer c.gtk_window_destroy(gtk_window);
self.window = gtk_window; self.window = gtk_window;
c.gtk_window_set_title(gtk_window, "Ghostty"); c.gtk_window_set_title(gtk_window, "Ghostty: Terminal Inspector");
c.gtk_window_set_default_size(gtk_window, 1000, 600); c.gtk_window_set_default_size(gtk_window, 1000, 600);
self.icon = try icon.appIcon(self.inspector.surface.app, window); self.icon = try icon.appIcon(self.inspector.surface.app, window);
c.gtk_window_set_icon_name(gtk_window, self.icon.name); c.gtk_window_set_icon_name(gtk_window, self.icon.name);