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

Clean up layer arrangement

Browse Source
This commit is contained in:
Isaac Freund 2020-04-15 14:39:43 +02:00
parent 652a347fa0
commit a6eeb5bbba
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/output.zig
View File

@ -209,20 +209,25 @@ pub const Output = struct {
// This box is modified as exclusive zones are applied // This box is modified as exclusive zones are applied
var usable_box = full_box; var usable_box = full_box;
self.arrangeLayer(self.layers[@intCast(usize, c.ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY)], full_box, &usable_box, true); const layers = [_]usize{
self.arrangeLayer(self.layers[@intCast(usize, c.ZWLR_LAYER_SHELL_V1_LAYER_TOP)], full_box, &usable_box, true); c.ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY,
self.arrangeLayer(self.layers[@intCast(usize, c.ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM)], full_box, &usable_box, true); c.ZWLR_LAYER_SHELL_V1_LAYER_TOP,
self.arrangeLayer(self.layers[@intCast(usize, c.ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND)], full_box, &usable_box, true); c.ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM,
c.ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND,
};
for (layers) |layer| {
self.arrangeLayer(self.layers[layer], full_box, &usable_box, true);
}
if (self.usable_box.width != usable_box.width or self.usable_box.height != usable_box.height) { if (self.usable_box.width != usable_box.width or self.usable_box.height != usable_box.height) {
self.usable_box = usable_box; self.usable_box = usable_box;
self.root.arrange(); self.root.arrange();
} }
self.arrangeLayer(self.layers[@intCast(usize, c.ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY)], full_box, &usable_box, false); for (layers) |layer| {
self.arrangeLayer(self.layers[@intCast(usize, c.ZWLR_LAYER_SHELL_V1_LAYER_TOP)], full_box, &usable_box, false); self.arrangeLayer(self.layers[layer], full_box, &usable_box, false);
self.arrangeLayer(self.layers[@intCast(usize, c.ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM)], full_box, &usable_box, false); }
self.arrangeLayer(self.layers[@intCast(usize, c.ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND)], full_box, &usable_box, false);
// TODO: handle seat focus // TODO: handle seat focus
} }