mirror of
https://gitlab.freedesktop.org/wayland/weston.git
synced 2025-12-26 05:20:11 +01:00
desktop-shell: Don't attempt to re-add the view to panel layer
This change fixes a side-effect of weston_view_move_to_layer helper
which would basically unmap the view because the layer entry list is no
longer visible. Only add the view to panel layer the first time.
Fixes: #956
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
(cherry picked from commit 217fb30847)
This commit is contained in:
parent
6d015b4759
commit
e056153bf4
1 changed files with 3 additions and 2 deletions
|
|
@ -2895,13 +2895,14 @@ panel_committed(struct weston_surface *es,
|
||||||
weston_surface_map(es);
|
weston_surface_map(es);
|
||||||
assert(wl_list_empty(&es->views));
|
assert(wl_list_empty(&es->views));
|
||||||
sh_output->panel_view = weston_view_create(es);
|
sh_output->panel_view = weston_view_create(es);
|
||||||
|
|
||||||
|
weston_view_move_to_layer(sh_output->panel_view,
|
||||||
|
&shell->panel_layer.view_list);
|
||||||
}
|
}
|
||||||
|
|
||||||
assert(sh_output->panel_view);
|
assert(sh_output->panel_view);
|
||||||
pos = weston_coord_global_add(output->pos, sh_output->panel_offset);
|
pos = weston_coord_global_add(output->pos, sh_output->panel_offset);
|
||||||
weston_view_set_position(sh_output->panel_view, pos);
|
weston_view_set_position(sh_output->panel_view, pos);
|
||||||
weston_view_move_to_layer(sh_output->panel_view,
|
|
||||||
&shell->panel_layer.view_list);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue