From db3020f370434d2c2ed620d631ec32f3c8d03181 Mon Sep 17 00:00:00 2001 From: Squibid Date: Sun, 26 Oct 2025 22:16:20 -0400 Subject: [PATCH] cleanup ordering of output code and remove duplicate call to add to the output_layout --- src/output.zig | 4 ---- src/root.zig | 5 ++--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/output.zig b/src/output.zig index 4ec10cf..316cb13 100644 --- a/src/output.zig +++ b/src/output.zig @@ -37,10 +37,6 @@ pub fn create(wlr_output: *wlr.Output) *Output { std.log.debug("adding output: {s}", .{output.wlr_output.name}); - // I don't think we need the result of this - const layout_output = try server.root.output_layout.addAuto(wlr_output); - server.root.scene_output_layout.addOutput(layout_output, output.scene_output); - return output; } diff --git a/src/root.zig b/src/root.zig index 0668ac1..0a54338 100644 --- a/src/root.zig +++ b/src/root.zig @@ -38,8 +38,6 @@ pub fn init(self: *Root) void { .scene_output_layout = try scene.attachOutputLayout(output_layout), .views = .init(gpa) }; - - } pub fn deinit(self: *Root) void { @@ -56,7 +54,8 @@ pub fn deinit(self: *Root) void { pub fn addOutput(self: *Root, new_output: *Output) void { errdefer Utils.oomPanic(); - _ = try self.output_layout.addAuto(new_output.wlr_output); + const layout_output = try self.output_layout.addAuto(new_output.wlr_output); + self.scene_output_layout.addOutput(layout_output, new_output.scene_output); server.seat.focusOutput(new_output); }