mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-02 09:01:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

magnifier: fix flickering on simultaneous gamma changes

Browse source 
Gamma changes take another code path and thus did not
render the magnifier. This patch consalidates both
code paths and therefore also renders the magnifier on
gamma changes.

Fixes: #1905
This commit is contained in:
Consolatis 2024-06-17 16:36:07 +02:00
parent b8c3e064e7
commit 45b197b8a4
4 changed files with 61 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/common/scene-helpers.c
View file

@ -40,11 +40,12 @@ lab_wlr_scene_get_prev_node(struct wlr_scene_node *node)
* as it doesn't use the pending state at all.
*/
bool
lab_wlr_scene_output_commit(struct wlr_scene_output *scene_output)
lab_wlr_scene_output_commit(struct wlr_scene_output *scene_output,
struct wlr_output_state *state)
{
assert(scene_output);
assert(state);
struct wlr_output *wlr_output = scene_output->output;
struct wlr_output_state *state = &wlr_output->pending;
struct output *output = wlr_output->data;
bool wants_magnification = output_wants_magnification(output);
@ -70,11 +71,18 @@ lab_wlr_scene_output_commit(struct wlr_scene_output *scene_output)
magnify(output, state->buffer, &additional_damage);
}
if (!wlr_output_commit(wlr_output)) {
wlr_log(WLR_INFO, "Failed to commit output %s",
if (state == &wlr_output->pending) {
if (!wlr_output_commit(wlr_output)) {
wlr_log(WLR_INFO, "Failed to commit output %s",
wlr_output->name);
return false;
}
} else if (!wlr_output_commit_state(wlr_output, state)) {
wlr_log(WLR_INFO, "Failed to commit state for output %s",
wlr_output->name);
return false;
}
/*
* FIXME: Remove the following line as soon as
* https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4253