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

Merge branch 'master' of https://codeberg.org/river/river

Browse Source
This commit is contained in:
Alexander Rosenberg 2024-11-01 15:43:44 -07:00
commit eab34c7c03
Signed by: Zander671
GPG Key ID: 5FD0394ADBD72730
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
river/Output.zig
View File

@ -393,11 +393,15 @@ fn sendLayerConfigures(
usable_box.* = new_usable_box;
}
layer_surface.popup_tree.node.setPosition(
layer_surface.scene_layer_surface.tree.node.x,
layer_surface.scene_layer_surface.tree.node.y,
);
layer_surface.scene_layer_surface.tree.node.subsurfaceTreeSetClip(&full_box);
const x = layer_surface.scene_layer_surface.tree.node.x;
const y = layer_surface.scene_layer_surface.tree.node.y;
layer_surface.popup_tree.node.setPosition(x, y);
layer_surface.scene_layer_surface.tree.node.subsurfaceTreeSetClip(&.{
.x = -x,
.y = -y,
.width = full_box.width,
.height = full_box.height,
});
}
}
}
@ -547,7 +551,9 @@ fn renderAndCommit(output: *Output, scene_output: *wlr.SceneOutput) !void {
const control = server.root.gamma_control_manager.getControl(output.wlr_output);
if (!wlr.GammaControlV1.apply(control, &state)) return error.OutOfMemory;
if (!output.wlr_output.testState(&state)) {
// TODO(wlroots): remove this isHeadless() workaround after upstream fix is available
// in a release: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4868
if (!output.wlr_output.testState(&state) or output.wlr_output.isHeadless()) {
wlr.GammaControlV1.sendFailedAndDestroy(control);
state.clearGammaLut();
// If the backend does not support gamma LUTs it will reject any