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

Compare commits

base: Zander671:eab34c7c03b77d205887bd8fc45d9a535ed3e03c
Branches Tags
Zander671:main
..
compare: Zander671:dbe2cb72f8e4188e2ef2895cda4520a7d5c3b4b8
Branches Tags
Zander671:main

No commits in common. "eab34c7c03b77d205887bd8fc45d9a535ed3e03c" and "dbe2cb72f8e4188e2ef2895cda4520a7d5c3b4b8" have entirely different histories.
eab34c7c03 ... dbe2cb72f8

1 changed files with 6 additions and 12 deletions
Show Stats Expand all files Collapse all files

18
river/Output.zig
View File

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