git.lucas.co / cce-compositor
Wayland compositor (wlroots)
git clone https://git.lucas.co/cce-compositor.git

commit5c72733eecd27f66fd8c070c5aed5b629738f638
parent4b680b3e4c
authorIsaac Freund <[email protected]>
date2023-06-20 15:26
river-layout: Remove incorrect assertion

This assertion is not correct since removing transaction preemption.

 river/LayoutDemand.zig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/river/LayoutDemand.zig b/river/LayoutDemand.zig
index a127938..599a642 100644
--- a/river/LayoutDemand.zig
+++ b/river/LayoutDemand.zig
@@ -98,6 +98,8 @@ pub fn pushViewDimensions(self: *Self, x: i32, y: i32, width: u31, height: u31)
 
 /// Apply the proposed layout to the output
 pub fn apply(self: *Self, layout: *Layout) void {
+    // Note: output.layout may not be equal to layout here if the layout
+    // namespace changes while a transactions is inflight.
     const output = layout.output;
 
     // Whether the layout demand succeeds or fails, we are done with it and
@@ -152,5 +154,4 @@ pub fn apply(self: *Self, layout: *Layout) void {
         }
     }
     assert(i == self.view_boxen.len);
-    assert(output.layout == layout);
 }