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

apprt/gtk-ng: go to right focus when split closes

pull/8210/head
Mitchell Hashimoto 2025-08-11 09:51:54 -07:00
parent 5903d7d10f
commit 70d48d03a5
No known key found for this signature in database
GPG Key ID: 523D5DC389D273BC
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/apprt/gtk-ng/class/split_tree.zig
View File

@ -589,8 +589,23 @@ pub const SplitTree = extern struct {
const handle = priv.pending_close orelse return;
priv.pending_close = null;
// Remove it from the tree.
// Figure out our next focus target. The next focus target is
// always the "previous" surface unless we're the leftmost then
// its the next.
const old_tree = self.getTree() orelse return;
const next_focus: ?*Surface = next_focus: {
const next_handle = old_tree.goto(handle, .previous) orelse
old_tree.goto(handle, .next) orelse
break :next_focus null;
if (next_handle == handle) break :next_focus null;
// Note: we don't need to ref this or anything because its
// guaranteed to remain in the new tree since its not part
// of the handle we're removing.
break :next_focus old_tree.nodes[next_handle].leaf;
};
// Remove it from the tree.
var new_tree = old_tree.remove(
Application.default().allocator(),
handle,
@ -600,6 +615,10 @@ pub const SplitTree = extern struct {
};
defer new_tree.deinit();
self.setTree(&new_tree);
// Grab focus. We have to set this on the "last focused" because our
// focus will be set when the tree is redrawn.
if (next_focus) |v| priv.last_focused.set(v);
}
fn propSurfaceFocused(