summaryrefslogtreecommitdiff
path: root/desktop-shell
diff options
context:
space:
mode:
authorDaniel Stone <daniels@collabora.com>2022-06-12 20:51:45 +0100
committerMarius Vlad <marius.vlad@collabora.com>2022-06-16 12:17:15 +0300
commit0c69688aa238c3576f99486b177f527f668ee704 (patch)
treed5ea1c6e7be27a0ff457580fc80e26724a6a08fe /desktop-shell
parent51fe874ad4152fceaf2de50db96c1ec5e08bca1b (diff)
downloadweston-0c69688aa238c3576f99486b177f527f668ee704.tar.gz
libweston: Add weston_surface_map() wrapper
Change all instances of surface->is_mapped = true, to a specialised function. Signed-off-by: Daniel Stone <daniels@collabora.com>
Diffstat (limited to 'desktop-shell')
-rw-r--r--desktop-shell/input-panel.c2
-rw-r--r--desktop-shell/shell.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/desktop-shell/input-panel.c b/desktop-shell/input-panel.c
index 0897ffde..6dc2e427 100644
--- a/desktop-shell/input-panel.c
+++ b/desktop-shell/input-panel.c
@@ -103,8 +103,8 @@ show_input_panel_surface(struct input_panel_surface *ipsurf)
&ipsurf->view->layer_link);
weston_view_geometry_dirty(ipsurf->view);
weston_view_update_transform(ipsurf->view);
- ipsurf->surface->is_mapped = true;
ipsurf->view->is_mapped = true;
+ weston_surface_map(ipsurf->surface);
weston_surface_damage(ipsurf->surface);
if (ipsurf->anim)
diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index 87bcae3d..73dbdce7 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -2501,7 +2501,7 @@ desktop_surface_committed(struct weston_desktop_surface *desktop_surface,
if (!weston_surface_is_mapped(surface)) {
map(shell, shsurf, sx, sy);
- surface->is_mapped = true;
+ 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) {
@@ -2914,7 +2914,7 @@ configure_static_view(struct weston_view *ev, struct weston_layer *layer, int x,
}
weston_view_set_position(ev, ev->output->x + x, ev->output->y + y);
- ev->surface->is_mapped = true;
+ weston_surface_map(ev->surface);
ev->is_mapped = true;
if (wl_list_empty(&ev->layer_link.link)) {
@@ -3136,7 +3136,7 @@ lock_surface_committed(struct weston_surface *surface, int32_t sx, int32_t sy)
weston_layer_entry_insert(&shell->lock_layer.view_list,
&view->layer_link);
weston_view_update_transform(view);
- surface->is_mapped = true;
+ weston_surface_map(surface);
view->is_mapped = true;
shell_fade(shell, FADE_IN);
}