Zander671/river
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Root: simplify scene tree reparenting

Browse Source 
Making these reparent() calls unconditional avoids inconsistent state.
It's also simpler and less error-prone and the wlroots function returns
immediately if the parent doesn't change anyways.
This commit is contained in:
Isaac Freund
2024-08-07 11:05:46 +02:00
parent f5d37f9b4d
commit db7de8151c
1 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
river/Root.zig
View File

@ -673,24 +673,12 @@ fn commitTransaction(root: *Root) void {
while (focus_stack_it.next()) |view| { while (focus_stack_it.next()) |view| {
assert(view.inflight.output == output); assert(view.inflight.output == output);
if (view.current.output != view.inflight.output or if (view.inflight.float) {
(output.current.fullscreen == view and output.inflight.fullscreen != view)) view.tree.node.reparent(output.layers.float);
{ } else {
if (view.inflight.float) { view.tree.node.reparent(output.layers.layout);
view.tree.node.reparent(output.layers.float);
} else {
view.tree.node.reparent(output.layers.layout);
}
view.popup_tree.node.reparent(output.layers.popups);
}
if (view.current.float != view.inflight.float) {
if (view.inflight.float) {
view.tree.node.reparent(output.layers.float);
} else {
view.tree.node.reparent(output.layers.layout);
}
} }
view.popup_tree.node.reparent(output.layers.popups);
view.commitTransaction(); view.commitTransaction();
@ -703,15 +691,13 @@ fn commitTransaction(root: *Root) void {
} }
} }
if (output.inflight.fullscreen != output.current.fullscreen) { if (output.inflight.fullscreen) |view| {
if (output.inflight.fullscreen) |view| { assert(view.inflight.output == output);
assert(view.inflight.output == output); assert(view.current.output == output);
assert(view.current.output == output); view.tree.node.reparent(output.layers.fullscreen);
view.tree.node.reparent(output.layers.fullscreen);
}
output.current.fullscreen = output.inflight.fullscreen;
output.layers.fullscreen.node.setEnabled(output.current.fullscreen != null);
} }
output.current.fullscreen = output.inflight.fullscreen;
output.layers.fullscreen.node.setEnabled(output.current.fullscreen != null);
output.status.handleTransactionCommit(output); output.status.handleTransactionCommit(output);
} }