neurocyte/flow
neurocyte/flow
1
1
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

fix: properly handle closing editors in unfocused splits

Browse source
This commit is contained in:
CJ van den Berg 2026-01-20 14:42:50 +01:00
parent 0992f08a94
commit f34285d2aa
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/tui/mainview.zig
View file

@ -1496,7 +1496,8 @@ pub fn handle_editor_event(self: *Self, editor: *ed.Editor, m: tp.message) tp.re
if (try m.match(.{ "E", "close" })) { if (try m.match(.{ "E", "close" })) {
if (!self.closing_project) { if (!self.closing_project) {
if (self.get_next_mru_buffer_for_view(self.active_view, .non_hidden)) |file_path| const view = self.get_view_for_editor(editor) orelse return;
if (self.get_next_mru_buffer_for_view(view, .non_hidden)) |file_path|
self.show_file_async(file_path) self.show_file_async(file_path)
else { else {
if (self.views.widgets.items.len == 1) if (self.views.widgets.items.len == 1)
@ -1599,8 +1600,13 @@ pub fn get_view_count(self: *const Self) usize {
} }
pub fn get_active_editor(self: *Self) ?*ed.Editor { pub fn get_active_editor(self: *Self) ?*ed.Editor {
const active_view = self.views.get_at(self.active_view) orelse return null; return self.get_editor_for_view(self.active_view);
const editor = active_view.get("editor") orelse return null; }
pub fn get_editor_for_view(self: *Self, view_idx: usize) ?*ed.Editor {
if (view_idx >= self.get_view_count()) return null;
const view = self.views.get_at(view_idx) orelse return null;
const editor = view.get("editor") orelse return null;
if (editor.dynamic_cast(ed.EditorWidget)) |p| { if (editor.dynamic_cast(ed.EditorWidget)) |p| {
return &p.editor; return &p.editor;
} }
@ -1649,6 +1655,16 @@ pub fn get_view_for_file(self: *Self, file_path: []const u8) ?usize {
return null; return null;
} }
pub fn get_view_for_editor(self: *Self, editor: *ed.Editor) ?usize {
for (self.views.widgets.items, 0..) |*view, n| {
const widget = view.widget.get("editor") orelse continue;
if (widget.dynamic_cast(ed.EditorWidget)) |p|
if (&p.editor == editor)
return n;
}
return null;
}
pub fn get_file_for_view(self: *Self, view_: usize) ?[]const u8 { pub fn get_file_for_view(self: *Self, view_: usize) ?[]const u8 {
const view = self.views.get_at(view_) orelse return null; const view = self.views.get_at(view_) orelse return null;
const editor = view.get("editor") orelse return null; const editor = view.get("editor") orelse return null;