aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsaac Freund <ifreund@ifreund.xyz>2020-06-08 14:11:52 +0200
committerIsaac Freund <ifreund@ifreund.xyz>2020-06-08 14:11:52 +0200
commit7c094420edb4892dc181f39bad0c4ec641444f9c (patch)
tree37464ddad65483d8d72c0be3b430b0d2007463c5
parent5f2aa021327b7dc36e4c14f78e1c9046199d635c (diff)
downloadriver-7c094420edb4892dc181f39bad0c4ec641444f9c.tar.gz
river-7c094420edb4892dc181f39bad0c4ec641444f9c.tar.xz
transactions: propogate x/y of new box if needed
-rw-r--r--river/Root.zig12
1 files changed, 9 insertions, 3 deletions
diff --git a/river/Root.zig b/river/Root.zig
index f009d32..b034f39 100644
--- a/river/Root.zig
+++ b/river/Root.zig
@@ -158,11 +158,17 @@ fn startTransaction(self: *Self) void {
},
.old_configure => {
self.pending_configures += 1;
- view.next_box = null;
- std.debug.assert(view.pending_serial != null);
+ if (view.next_box) |next_box| {
+ view.pending_box.?.x = next_box.x;
+ view.pending_box.?.y = next_box.y;
+ view.next_box = null;
+ }
},
.noop => {
- view.next_box = null;
+ if (view.next_box) |next_box| {
+ view.pending_box = view.next_box;
+ view.next_box = null;
+ }
std.debug.assert(view.pending_serial == null);
},
}