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

gtk: switch to long-held reference for GtkPaned

Browse Source
This commit is contained in:
Thorsten Ball
2023-11-26 07:32:59 +01:00
committed by Mitchell Hashimoto
parent e2a58b340c
commit 1b4fc83f43
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/apprt/gtk/Split.zig
View File

@ -62,6 +62,9 @@ pub fn init(
const paned = c.gtk_paned_new(orientation); const paned = c.gtk_paned_new(orientation);
errdefer c.g_object_unref(paned); errdefer c.g_object_unref(paned);
// Keep a long-lived reference, which we unref in destroy.
_ = c.g_object_ref(paned);
// Update all of our containers to point to the right place. // Update all of our containers to point to the right place.
// The split has to point to where the sibling pointed to because // The split has to point to where the sibling pointed to because
// we're inheriting its parent. The sibling points to its location // we're inheriting its parent. The sibling points to its location
@ -94,6 +97,9 @@ pub fn destroy(self: *Split, alloc: Allocator) void {
self.top_left.deinit(alloc); self.top_left.deinit(alloc);
self.bottom_right.deinit(alloc); self.bottom_right.deinit(alloc);
// Clean up our GTK reference.
c.g_object_unref(self.paned);
alloc.destroy(self); alloc.destroy(self);
} }
@ -112,12 +118,6 @@ inline fn removeChild(self: *Split, remove: Surface.Container.Elem, keep: Surfac
const window = self.container.window() orelse return; const window = self.container.window() orelse return;
const alloc = window.app.core_app.alloc; const alloc = window.app.core_app.alloc;
// Keep a reference to the side that we want to keep, so it doesn't get
// destroyed when it's removed from our underlying GtkPaned.
const keep_object: *c.GObject = @ptrCast(keep.widget());
_ = c.g_object_ref(keep_object);
defer c.g_object_unref(keep_object);
// Remove our children since we are going to no longer be // Remove our children since we are going to no longer be
// a split anyways. This prevents widgets with multiple parents. // a split anyways. This prevents widgets with multiple parents.
self.removeChildren(); self.removeChildren();
@ -159,19 +159,6 @@ pub fn grabFocus(self: *Split) void {
/// This should be called anytime the top/left or bottom/right /// This should be called anytime the top/left or bottom/right
/// element is changed. /// element is changed.
fn updateChildren(self: *const Split) void { fn updateChildren(self: *const Split) void {
// TODO: Not sure we should keep this.
//
// We keep references to both widgets, because only Surface widgets have
// long-held references but GtkPaned will also get destroyed if we don't
// keep a reference here before removing.
const top_left_object: *c.GObject = @ptrCast(self.top_left.widget());
_ = c.g_object_ref(top_left_object);
defer c.g_object_unref(top_left_object);
const bottom_right_object: *c.GObject = @ptrCast(self.bottom_right.widget());
_ = c.g_object_ref(bottom_right_object);
defer c.g_object_unref(bottom_right_object);
// We have to set both to null. If we overwrite the pane with // We have to set both to null. If we overwrite the pane with
// the same value, then GTK bugs out (the GL area unrealizes // the same value, then GTK bugs out (the GL area unrealizes
// and never rerealizes). // and never rerealizes).