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

Merge branch 'master' into zig-0.14

Browse source
This commit is contained in:
CJ van den Berg 2025-02-13 12:08:54 +01:00
commit 5fc2247bc3
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
4 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/tui/editor.zig
View file

@ -4073,7 +4073,10 @@ pub const Editor = struct {
} else if (ctx.args.match(.{tp.extract(&file_path)}) catch false) {
try self.open_scratch(file_path, "", null);
self.clamp();
} else return error.InvalidOpenScratchBufferArgument;
} else {
try self.open_scratch("*scratch*", "", null);
self.clamp();
}
}
pub const open_scratch_buffer_meta: Meta = .{ .arguments = &.{ .string, .string } };

3
src/tui/mainview.zig
View file

@ -465,7 +465,8 @@ const cmds = struct {
}
}
try command.executeName("create_scratch_buffer", command.fmt(.{name.items}));
try command.executeName("change_file_type", .{});
if (tp.env.get().str("language").len == 0)
try command.executeName("change_file_type", .{});
}
pub const create_new_file_meta: Meta = .{ .description = "Create: New File…" };

6
src/tui/tui.zig
View file

@ -868,7 +868,7 @@ const cmds = struct {
pub fn exit_overlay_mode(self: *Self, _: Ctx) Result {
self.rdr_.cursor_disable();
if (self.input_mode_outer_ == null) return;
if (self.input_mode_outer_ == null) return enter_mode_default(self, .{});
if (self.input_mode_) |*mode| mode.deinit();
self.input_mode_ = self.input_mode_outer_;
self.input_mode_outer_ = null;
@ -1290,7 +1290,8 @@ pub fn message(comptime fmt: anytype, args: anytype) void {
tp.self_pid().send(.{ "message", std.fmt.bufPrint(&buf, fmt, args) catch @panic("too large") }) catch {};
}
pub fn render_file_icon(self: *renderer.Plane, icon: []const u8, color: u24) void { var cell = self.cell_init();
pub fn render_file_icon(self: *renderer.Plane, icon: []const u8, color: u24) void {
var cell = self.cell_init();
_ = self.at_cursor_cell(&cell) catch return;
if (!(color == 0xFFFFFF or color == 0x000000 or color == 0x000001)) {
cell.set_fg_rgb(@intCast(color)) catch {};
@ -1307,4 +1308,3 @@ pub fn render_match_cell(self: *renderer.Plane, y: usize, x: usize, theme_: *con
cell.set_style(theme_.editor_match);
_ = self.putc(&cell) catch {};
}