Merge branch 'main' into 'master'

output: fix effective resolution calculation with ceil()

See merge request wlroots/wlroots!5171
This commit is contained in:
sunzhguy 2026-04-11 10:42:09 +00:00
commit b2d711a374

View file

@ -472,8 +472,8 @@ void wlr_output_transformed_resolution(struct wlr_output *output,
void wlr_output_effective_resolution(struct wlr_output *output, void wlr_output_effective_resolution(struct wlr_output *output,
int *width, int *height) { int *width, int *height) {
wlr_output_transformed_resolution(output, width, height); wlr_output_transformed_resolution(output, width, height);
*width /= output->scale; *width = ceil(*width / output->scale);
*height /= output->scale; *height = ceil(*height / output->scale);
} }
struct wlr_output_mode *wlr_output_preferred_mode(struct wlr_output *output) { struct wlr_output_mode *wlr_output_preferred_mode(struct wlr_output *output) {