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

feat: allow moving tabs to empty splits

Browse source
This commit is contained in:
CJ van den Berg 2026-02-04 09:53:18 +01:00
parent 2d2d8a915b
commit cc2aabf7dd
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
2 changed files with 26 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/tui/mainview.zig
View file

@ -1792,7 +1792,7 @@ fn remove_view(self: *Self, view: usize) void {
const buffers = self.buffer_manager.list_unordered(self.allocator) catch @panic("OOM remove_view"); const buffers = self.buffer_manager.list_unordered(self.allocator) catch @panic("OOM remove_view");
defer self.allocator.free(buffers); defer self.allocator.free(buffers);
for (buffers) |buffer| if (buffer.get_last_view()) |buffer_view| for (buffers) |buffer| if (buffer.get_last_view()) |buffer_view|
if (buffer_view >= view) if (buffer_view > view)
buffer.set_last_view(buffer_view - 1); buffer.set_last_view(buffer_view - 1);
} }

38
src/tui/status/tabs.zig
View file

@ -202,6 +202,7 @@ pub const TabBar = struct {
} else if (try m.match(.{ "E", "close" })) { } else if (try m.match(.{ "E", "close" })) {
self.refresh_active_buffer(); self.refresh_active_buffer();
} else if (try m.match(.{"splits_updated"})) { } else if (try m.match(.{"splits_updated"})) {
self.refresh_active_buffer();
const drag_source, _ = tui.get_drag_source(); const drag_source, _ = tui.get_drag_source();
self.update_tab_widgets(drag_source) catch {}; self.update_tab_widgets(drag_source) catch {};
} }
@ -399,11 +400,11 @@ pub const TabBar = struct {
return drop_target.create(self, view); return drop_target.create(self, view);
} }
fn find_buffer_tab(self: *Self, buffer_ref: Buffer.Ref) ?usize { fn find_buffer_tab(self: *Self, buffer_ref: Buffer.Ref) struct { ?usize, usize } {
for (self.tabs, 0..) |*tab, idx| for (self.tabs, 0..) |*tab, idx|
if (tab.widget.dynamic_cast(Tab.ButtonType)) |btn| if (tab.widget.dynamic_cast(Tab.ButtonType)) |btn|
if (btn.opts.ctx.buffer_ref == buffer_ref) return idx; if (btn.opts.ctx.buffer_ref == buffer_ref) return .{ idx, btn.opts.ctx.view };
return null; return .{ null, 0 };
} }
fn find_first_tab_buffer(self: *Self) ?Buffer.Ref { fn find_first_tab_buffer(self: *Self) ?Buffer.Ref {
@ -463,20 +464,24 @@ pub const TabBar = struct {
fn move_tab_next(self: *Self) void { fn move_tab_next(self: *Self) void {
tp.trace(tp.channel.debug, .{"move_tab_next"}); tp.trace(tp.channel.debug, .{"move_tab_next"});
const this_idx = self.find_buffer_tab(self.active_focused_buffer_ref orelse return) orelse return; const this_idx_, const this_view = self.find_buffer_tab(self.active_focused_buffer_ref orelse return);
const other_buffer_ref_, _ = self.find_next_tab_buffer(); const this_idx = this_idx_ orelse return;
const other_buffer_ref = other_buffer_ref_ orelse return self.move_tab_to_new_split(this_idx); const other_buffer_ref_, const other_view = self.find_next_tab_buffer();
const other_idx = self.find_buffer_tab(other_buffer_ref) orelse return; const other_buffer_ref = other_buffer_ref_ orelse return self.move_tab_to_new_split(this_idx, this_view);
self.move_tab_to(other_idx, this_idx); if (other_view -| this_view > 1) return self.move_tab_to_view(this_view + 1, this_idx);
const other_idx, _ = self.find_buffer_tab(other_buffer_ref);
if (other_idx) |idx| self.move_tab_to(idx, this_idx);
} }
fn move_tab_previous(self: *Self) void { fn move_tab_previous(self: *Self) void {
tp.trace(tp.channel.debug, .{"move_tab_previous"}); tp.trace(tp.channel.debug, .{"move_tab_previous"});
const this_idx = self.find_buffer_tab(self.active_focused_buffer_ref orelse return) orelse return; const this_idx_, const this_view = self.find_buffer_tab(self.active_focused_buffer_ref orelse return);
const other_buffer_ref_, _ = self.find_previous_tab_buffer(); const this_idx = this_idx_ orelse return;
const other_buffer_ref_, const other_view = self.find_previous_tab_buffer();
const other_buffer_ref = other_buffer_ref_ orelse return; const other_buffer_ref = other_buffer_ref_ orelse return;
const other_idx = self.find_buffer_tab(other_buffer_ref) orelse return; if (this_view -| other_view > 1) return self.move_tab_to_view(this_view -| 1, this_idx);
self.move_tab_to(other_idx, this_idx); const other_idx, _ = self.find_buffer_tab(other_buffer_ref);
if (other_idx) |idx| self.move_tab_to(idx, this_idx);
} }
fn move_tab_to(self: *Self, dst_idx: usize, src_idx: usize) void { fn move_tab_to(self: *Self, dst_idx: usize, src_idx: usize) void {
@ -547,20 +552,23 @@ pub const TabBar = struct {
navigate_to_buffer(src_tab.buffer_ref); navigate_to_buffer(src_tab.buffer_ref);
} }
fn move_tab_to_new_split(self: *Self, src_idx: usize) void { fn move_tab_to_new_split(self: *Self, src_idx: usize, src_view: usize) void {
const mv = tui.mainview() orelse return; const mv = tui.mainview() orelse return;
const src_tab = &self.tabs[src_idx];
var tabs_in_view: usize = 0; var tabs_in_view: usize = 0;
for (self.tabs) |*tab| if (tab.view) |view| { for (self.tabs) |*tab| if (tab.view) |view| {
if (view == src_tab.view) if (view == src_view)
tabs_in_view += 1; tabs_in_view += 1;
}; };
if (tabs_in_view > 1) { if (tabs_in_view > 1) {
const view = mv.get_view_count(); const view = mv.get_view_count();
if (view -| src_view > 1) {
self.move_tab_to_view(src_view + 1, src_idx);
} else {
mv.create_home_split() catch return; mv.create_home_split() catch return;
self.move_tab_to_view(view, src_idx); self.move_tab_to_view(view, src_idx);
} }
} }
}
fn place_next_tab(self: *Self, position: enum { before, after }, buffer_ref: Buffer.Ref) void { fn place_next_tab(self: *Self, position: enum { before, after }, buffer_ref: Buffer.Ref) void {
tp.trace(tp.channel.debug, .{ "place_next_tab", position, buffer_ref }); tp.trace(tp.channel.debug, .{ "place_next_tab", position, buffer_ref });