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

feat: pre-select current theme when opening theme panel

Browse source
This commit is contained in:
CJ van den Berg 2024-12-05 22:12:13 +01:00
parent 745c4db0fe
commit cd2fec9be3
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
2 changed files with 42 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/tui/mode/overlay/palette.zig
View file

@ -34,6 +34,7 @@ pub fn Create(options: type) type {
entries: std.ArrayList(Entry) = undefined, entries: std.ArrayList(Entry) = undefined,
hints: ?*const tui.KeybindHints = null, hints: ?*const tui.KeybindHints = null,
longest_hint: usize = 0, longest_hint: usize = 0,
initial_selected: ?usize = null,
items: usize = 0, items: usize = 0,
view_rows: usize, view_rows: usize,
@ -79,9 +80,10 @@ pub fn Create(options: type) type {
if (@hasDecl(options, "restore_state")) if (@hasDecl(options, "restore_state"))
options.restore_state(self) catch {}; options.restore_state(self) catch {};
try self.commands.init(self); try self.commands.init(self);
try self.start_query(); try self.start_query(0);
try mv.floating_views.add(self.modal.widget()); try mv.floating_views.add(self.modal.widget());
try mv.floating_views.add(self.menu.container_widget); try mv.floating_views.add(self.menu.container_widget);
if (self.initial_selected) |idx| self.select(idx);
var mode = try keybind.mode("overlay/palette", allocator, .{ var mode = try keybind.mode("overlay/palette", allocator, .{
.insert_command = "overlay_insert_bytes", .insert_command = "overlay_insert_bytes",
}); });
@ -159,7 +161,7 @@ pub fn Create(options: type) type {
fn on_resize_menu(self: *Self, _: *Menu.State(*Self), _: Widget.Box) void { fn on_resize_menu(self: *Self, _: *Menu.State(*Self), _: Widget.Box) void {
self.do_resize(); self.do_resize();
self.start_query() catch {}; self.start_query(0) catch {};
} }
fn do_resize(self: *Self) void { fn do_resize(self: *Self) void {
@ -180,7 +182,7 @@ pub fn Create(options: type) type {
fn on_scroll(self: *Self, _: tp.pid_ref, m: tp.message) error{Exit}!void { fn on_scroll(self: *Self, _: tp.pid_ref, m: tp.message) error{Exit}!void {
if (try m.match(.{ "scroll_to", tp.extract(&self.view_pos) })) { if (try m.match(.{ "scroll_to", tp.extract(&self.view_pos) })) {
self.start_query() catch |e| return tp.exit_error(e, @errorReturnTrace()); self.start_query(0) catch |e| return tp.exit_error(e, @errorReturnTrace());
} }
} }
@ -196,7 +198,7 @@ pub fn Create(options: type) type {
self.view_pos -= Menu.scroll_lines; self.view_pos -= Menu.scroll_lines;
} }
self.update_scrollbar(); self.update_scrollbar();
self.start_query() catch {}; self.start_query(0) catch {};
} }
fn mouse_click_button5(menu: **Menu.State(*Self), _: *Button.State(*Menu.State(*Self))) void { fn mouse_click_button5(menu: **Menu.State(*Self), _: *Button.State(*Menu.State(*Self))) void {
@ -204,7 +206,7 @@ pub fn Create(options: type) type {
if (self.view_pos < @max(self.total_items, self.view_rows) - self.view_rows) if (self.view_pos < @max(self.total_items, self.view_rows) - self.view_rows)
self.view_pos += Menu.scroll_lines; self.view_pos += Menu.scroll_lines;
self.update_scrollbar(); self.update_scrollbar();
self.start_query() catch {}; self.start_query(0) catch {};
} }
pub fn receive(self: *Self, _: tp.pid_ref, m: tp.message) error{Exit}!bool { pub fn receive(self: *Self, _: tp.pid_ref, m: tp.message) error{Exit}!bool {
@ -216,7 +218,7 @@ pub fn Create(options: type) type {
return false; return false;
} }
fn start_query(self: *Self) !void { fn start_query(self: *Self, n: usize) !void {
self.items = 0; self.items = 0;
self.menu.reset_items(); self.menu.reset_items();
self.menu.selected = null; self.menu.selected = null;
@ -237,6 +239,9 @@ pub fn Create(options: type) type {
_ = try self.query_entries(self.inputbox.text.items); _ = try self.query_entries(self.inputbox.text.items);
} }
self.menu.select_down(); self.menu.select_down();
var i = n;
while (i > 0) : (i -= 1)
self.menu.select_down();
self.do_resize(); self.do_resize();
tui.current().refresh_hover(); tui.current().refresh_hover();
self.selection_updated(); self.selection_updated();
@ -300,7 +305,7 @@ pub fn Create(options: type) type {
} }
self.inputbox.cursor = self.inputbox.text.items.len; self.inputbox.cursor = self.inputbox.text.items.len;
self.view_pos = 0; self.view_pos = 0;
return self.start_query(); return self.start_query(0);
} }
fn delete_code_point(self: *Self) !void { fn delete_code_point(self: *Self) !void {
@ -309,7 +314,7 @@ pub fn Create(options: type) type {
self.inputbox.cursor = self.inputbox.text.items.len; self.inputbox.cursor = self.inputbox.text.items.len;
} }
self.view_pos = 0; self.view_pos = 0;
return self.start_query(); return self.start_query(0);
} }
fn insert_code_point(self: *Self, c: u32) !void { fn insert_code_point(self: *Self, c: u32) !void {
@ -318,14 +323,14 @@ pub fn Create(options: type) type {
try self.inputbox.text.appendSlice(buf[0..bytes]); try self.inputbox.text.appendSlice(buf[0..bytes]);
self.inputbox.cursor = self.inputbox.text.items.len; self.inputbox.cursor = self.inputbox.text.items.len;
self.view_pos = 0; self.view_pos = 0;
return self.start_query(); return self.start_query(0);
} }
fn insert_bytes(self: *Self, bytes: []const u8) !void { fn insert_bytes(self: *Self, bytes: []const u8) !void {
try self.inputbox.text.appendSlice(bytes); try self.inputbox.text.appendSlice(bytes);
self.inputbox.cursor = self.inputbox.text.items.len; self.inputbox.cursor = self.inputbox.text.items.len;
self.view_pos = 0; self.view_pos = 0;
return self.start_query(); return self.start_query(0);
} }
fn cmd(_: *Self, name_: []const u8, ctx: command.Context) tp.result { fn cmd(_: *Self, name_: []const u8, ctx: command.Context) tp.result {
@ -345,6 +350,20 @@ pub fn Create(options: type) type {
options.updated(self, self.menu.get_selected()) catch {}; options.updated(self, self.menu.get_selected()) catch {};
} }
fn select(self: *Self, idx: usize) void {
if (self.total_items < self.view_rows) {
self.view_pos = 0;
} else if (idx > self.total_items - self.view_rows) {
self.view_pos = self.total_items - self.view_rows;
} else if (idx > self.view_rows / 2) {
self.view_pos = idx - self.view_rows / 2;
} else {
self.view_pos = 0;
}
self.update_scrollbar();
self.start_query(idx - self.view_pos - 1) catch {};
}
const cmds = struct { const cmds = struct {
pub const Target = Self; pub const Target = Self;
const Ctx = command.Context; const Ctx = command.Context;
@ -356,7 +375,7 @@ pub fn Create(options: type) type {
self.view_pos + self.view_rows < self.total_items) self.view_pos + self.view_rows < self.total_items)
{ {
self.view_pos += 1; self.view_pos += 1;
try self.start_query(); try self.start_query(0);
self.menu.select_last(); self.menu.select_last();
self.selection_updated(); self.selection_updated();
return; return;
@ -371,7 +390,7 @@ pub fn Create(options: type) type {
if (self.menu.selected) |selected| { if (self.menu.selected) |selected| {
if (selected == 0 and self.view_pos > 0) { if (selected == 0 and self.view_pos > 0) {
self.view_pos -= 1; self.view_pos -= 1;
try self.start_query(); try self.start_query(0);
self.menu.select_first(); self.menu.select_first();
self.selection_updated(); self.selection_updated();
return; return;
@ -388,7 +407,7 @@ pub fn Create(options: type) type {
if (self.view_pos > self.total_items - self.view_rows) if (self.view_pos > self.total_items - self.view_rows)
self.view_pos = self.total_items - self.view_rows; self.view_pos = self.total_items - self.view_rows;
} }
try self.start_query(); try self.start_query(0);
self.menu.select_last(); self.menu.select_last();
self.selection_updated(); self.selection_updated();
} }
@ -399,7 +418,7 @@ pub fn Create(options: type) type {
self.view_pos -= self.view_rows self.view_pos -= self.view_rows
else else
self.view_pos = 0; self.view_pos = 0;
try self.start_query(); try self.start_query(0);
self.menu.select_first(); self.menu.select_first();
self.selection_updated(); self.selection_updated();
} }

10
src/tui/mode/overlay/theme_palette.zig
View file

@ -24,12 +24,18 @@ pub const Match = struct {
var previous_theme: ?[]const u8 = null; var previous_theme: ?[]const u8 = null;
pub fn load_entries(palette: *Type) !void { pub fn load_entries(palette: *Type) !void {
var idx: usize = 0;
previous_theme = tui.current().theme.name; previous_theme = tui.current().theme.name;
for (Widget.themes) |theme| for (Widget.themes) |theme| {
idx += 1;
(try palette.entries.addOne()).* = .{ (try palette.entries.addOne()).* = .{
.label = theme.description, .label = theme.description,
.name = theme.name, .name = theme.name,
}; };
if (previous_theme) |theme_name| if (std.mem.eql(u8, theme.name, theme_name)) {
palette.initial_selected = idx;
};
}
} }
pub fn add_menu_entry(palette: *Type, entry: *Entry, matches: ?[]const usize) !void { pub fn add_menu_entry(palette: *Type, entry: *Entry, matches: ?[]const usize) !void {
@ -49,6 +55,8 @@ fn select(menu: **Type.MenuState, button: *Type.ButtonState) void {
var iter = button.opts.label; var iter = button.opts.label;
if (!(cbor.matchString(&iter, &description_) catch false)) return; if (!(cbor.matchString(&iter, &description_) catch false)) return;
if (!(cbor.matchString(&iter, &name_) catch false)) return; if (!(cbor.matchString(&iter, &name_) catch false)) return;
if (previous_theme) |prev| if (std.mem.eql(u8, prev, name_))
return;
tp.self_pid().send(.{ "cmd", "exit_overlay_mode" }) catch |e| menu.*.opts.ctx.logger.err("theme_palette", e); tp.self_pid().send(.{ "cmd", "exit_overlay_mode" }) catch |e| menu.*.opts.ctx.logger.err("theme_palette", e);
tp.self_pid().send(.{ "cmd", "set_theme", .{name_} }) catch |e| menu.*.opts.ctx.logger.err("theme_palette", e); tp.self_pid().send(.{ "cmd", "set_theme", .{name_} }) catch |e| menu.*.opts.ctx.logger.err("theme_palette", e);
} }