diff options
| author | Daniel Stone <daniels@collabora.com> | 2022-06-01 17:47:29 +0100 |
|---|---|---|
| committer | Marius Vlad <marius.vlad@collabora.com> | 2022-06-16 12:17:15 +0300 |
| commit | af7dcdddac4526103268dd9247369aacef47a498 (patch) | |
| tree | 8863e6987f1b8eabb051f18c06822326eb02930c /desktop-shell | |
| parent | 0c69688aa238c3576f99486b177f527f668ee704 (diff) | |
| download | weston-af7dcdddac4526103268dd9247369aacef47a498.tar.gz | |
desktop-shell: Map surfaces in map()
The only caller of map() then manually sets is_mapped = true. Just do it
in the function which makes you think that's what it would do.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Diffstat (limited to 'desktop-shell')
| -rw-r--r-- | desktop-shell/shell.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index 73dbdce7..33bbfc16 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -2454,6 +2454,8 @@ map(struct desktop_shell *shell, struct shell_surface *shsurf, weston_view_set_output(shsurf->view, shsurf->output); } + weston_surface_map(surface); + if (!shell->locked) { wl_list_for_each(seat, &compositor->seat_list, link) activate(shell, shsurf->view, seat, @@ -2501,7 +2503,6 @@ desktop_surface_committed(struct weston_desktop_surface *desktop_surface, if (!weston_surface_is_mapped(surface)) { map(shell, shsurf, sx, sy); - weston_surface_map(surface); /* as we need to survive the weston_surface destruction we'll * need to take another reference */ if (shsurf->shell->win_close_animation_type == ANIMATION_FADE) { |