Skip to content

Commit 873e8ef

Browse files
committed
Remove Theme.deinit because we dont need to free a string anymore
1 parent bfb9b5b commit 873e8ef

File tree

4 files changed

+4
-17
lines changed

4 files changed

+4
-17
lines changed

src/editor/Editor.zig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -521,8 +521,6 @@ pub fn deinit(editor: *Editor, app: *App) !void {
521521
try editor.settings.save(app.allocator);
522522
editor.settings.deinit(app.allocator);
523523

524-
editor.theme.deinit(app.allocator);
525-
526524
if (editor.project_folder) |folder| app.allocator.free(folder);
527525

528526
editor.arena.deinit();

src/editor/Theme.zig

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,6 @@ pub fn pop(theme: *Theme) void {
182182
imgui.popStyleColorEx(28);
183183
}
184184

185-
pub fn deinit(theme: *Theme, allocator: std.mem.Allocator) void {
186-
_ = theme;
187-
_ = allocator;
188-
}
189-
190185
pub const StyleColorButton = struct {
191186
col: *Color,
192187
flags: imgui.ColorEditFlags = 0,

src/editor/explorer/layers.zig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ pub fn draw(editor: *Editor) !void {
4343
}
4444
imgui.sameLine();
4545

46-
const file_name = try std.fmt.allocPrintZ(pixi.app.allocator, "{s}", .{std.fs.path.basename(file.path)});
47-
defer pixi.app.allocator.free(file_name);
46+
const file_name = try std.fmt.allocPrintZ(editor.arena.allocator(), "{s}", .{std.fs.path.basename(file.path)});
4847

4948
imgui.text(file_name);
5049

src/editor/explorer/settings.zig

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ pub fn draw(core: *Core, editor: *Editor) !void {
159159
}
160160

161161
if (editor.popups.file_dialog_response) |response| {
162+
defer nfd.freePath(response.path);
162163
if (response.type == .export_theme) {
163164
try editor.theme.save(response.path);
164165

@@ -167,7 +168,6 @@ pub fn draw(core: *Core, editor: *Editor) !void {
167168
editor.settings.deinit(pixi.app.allocator);
168169
editor.settings.theme = try pixi.app.allocator.dupeZ(u8, std.fs.path.basename(response.path));
169170
}
170-
nfd.freePath(response.path);
171171
editor.popups.file_dialog_response = null;
172172
}
173173

@@ -191,15 +191,10 @@ fn searchThemes(editor: *Editor) !void {
191191
if (entry.kind == .file) {
192192
const ext = std.fs.path.extension(entry.name);
193193
if (std.mem.eql(u8, ext, ".json")) {
194-
const label = try std.fmt.allocPrintZ(pixi.app.allocator, "{s}", .{entry.name});
195-
defer pixi.app.allocator.free(label);
194+
const label = try std.fmt.allocPrintZ(editor.arena.allocator(), "{s}", .{entry.name});
196195
if (imgui.selectable(label)) {
197196
// Get the path to the selected theme
198-
const abs_path = try std.fs.path.joinZ(pixi.app.allocator, &.{ pixi.paths.themes, entry.name });
199-
defer pixi.app.allocator.free(abs_path);
200-
201-
// Free the old theme name
202-
editor.theme.deinit(pixi.app.allocator);
197+
const abs_path = try std.fs.path.joinZ(editor.arena.allocator(), &.{ pixi.paths.themes, entry.name });
203198

204199
// Load the new theme
205200
editor.theme = try Editor.Theme.loadOrDefault(abs_path);

0 commit comments

Comments
 (0)