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

fix: override cursor focus rendering during dropdown completion

Browse source
This commit is contained in:
CJ van den Berg 2026-02-03 16:54:00 +01:00
parent 7c61b2dac6
commit d5166e2f68
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/tui/editor.zig
View file

@ -361,6 +361,7 @@ pub const Editor = struct {
find_operation: ?enum { goto_next_match, goto_prev_match } = null, find_operation: ?enum { goto_next_match, goto_prev_match } = null,
highlight_references_state: enum { adding, done } = .done, highlight_references_state: enum { adding, done } = .done,
highlight_references_pending: Match.List = .empty, highlight_references_pending: Match.List = .empty,
cursor_focus_override: bool = false,
prefix_buf: [8]u8 = undefined, prefix_buf: [8]u8 = undefined,
prefix: []const u8 = &[_]u8{}, prefix: []const u8 = &[_]u8{},
@ -1307,7 +1308,7 @@ pub const Editor = struct {
try self.render_cursor_primary(&self.get_primary().cursor, theme, cell_map, focused); try self.render_cursor_primary(&self.get_primary().cursor, theme, cell_map, focused);
} }
fn render_cursor_primary(self: *Self, cursor: *const Cursor, theme: *const Widget.Theme, cell_map: CellMap, focused: bool) !void { fn render_cursor_primary(self: *Self, cursor: *const Cursor, theme: *const Widget.Theme, cell_map: CellMap, focused_: bool) !void {
const configured_shape = tui.get_cursor_shape(); const configured_shape = tui.get_cursor_shape();
const cursor_shape = if (tui.rdr().vx.caps.multi_cursor) const cursor_shape = if (tui.rdr().vx.caps.multi_cursor)
configured_shape configured_shape
@ -1321,6 +1322,8 @@ pub const Editor = struct {
const screen_pos = self.screen_cursor(cursor); const screen_pos = self.screen_cursor(cursor);
if (screen_pos) |pos| set_cell_map_cursor(cell_map, pos.row, pos.col); if (screen_pos) |pos| set_cell_map_cursor(cell_map, pos.row, pos.col);
const focused = focused_ or self.cursor_focus_override;
if (focused and self.enable_terminal_cursor) { if (focused and self.enable_terminal_cursor) {
if (screen_pos) |pos| { if (screen_pos) |pos| {
self.render_term_cursor(pos, cursor_shape); self.render_term_cursor(pos, cursor_shape);
@ -7145,6 +7148,7 @@ pub const EditorWidget = struct {
} }
pub fn focus(self: *Self) void { pub fn focus(self: *Self) void {
self.editor.cursor_focus_override = false;
if (self.focused) return; if (self.focused) return;
self.commands.register() catch @panic("editor.commands.register"); self.commands.register() catch @panic("editor.commands.register");
self.focused = true; self.focused = true;
@ -7153,6 +7157,7 @@ pub const EditorWidget = struct {
} }
pub fn unfocus(self: *Self) void { pub fn unfocus(self: *Self) void {
self.editor.cursor_focus_override = false;
if (self.focused) self.commands.unregister(); if (self.focused) self.commands.unregister();
self.focused = false; self.focused = false;
command.executeName("enter_mode_default", .{}) catch {}; command.executeName("enter_mode_default", .{}) catch {};

1
src/tui/mode/overlay/completion_dropdown.zig
View file

@ -46,6 +46,7 @@ pub fn init(self: *Type) error{ Stop, OutOfMemory }!void {
try self.value.commands.init(self); try self.value.commands.init(self);
self.value.editor = tui.get_active_editor() orelse return error.Stop; self.value.editor = tui.get_active_editor() orelse return error.Stop;
self.value.view = self.value.editor.view; self.value.view = self.value.editor.view;
self.value.editor.cursor_focus_override = true;
} }
pub fn load_entries(self: *Type) !usize { pub fn load_entries(self: *Type) !usize {