From ecc0d40314fa282e63a34d77f86fe5cc581e3ab0 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Fri, 14 Jul 2023 08:27:57 +0100 Subject: [PATCH] desktop-shell: Use weston_view_move_to_layer() for input panels Use our helper instead of open-coding view manipulation. Signed-off-by: Daniel Stone --- desktop-shell/input-panel.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/desktop-shell/input-panel.c b/desktop-shell/input-panel.c index 63f9f0ac9..6acef58e3 100644 --- a/desktop-shell/input-panel.c +++ b/desktop-shell/input-panel.c @@ -105,13 +105,9 @@ show_input_panel_surface(struct input_panel_surface *ipsurf) weston_view_set_position(ipsurf->view, pos); } - weston_layer_entry_insert(&shell->input_panel_layer.view_list, - &ipsurf->view->layer_link); - weston_view_geometry_dirty(ipsurf->view); - weston_view_update_transform(ipsurf->view); - ipsurf->view->is_mapped = true; weston_surface_map(ipsurf->surface); - weston_surface_damage(ipsurf->surface); + weston_view_move_to_layer(ipsurf->view, + &shell->input_panel_layer.view_list); if (ipsurf->anim) weston_view_animation_destroy(ipsurf->anim); @@ -169,7 +165,7 @@ hide_input_panels(struct wl_listener *listener, void *data) wl_list_for_each_safe(view, next, &shell->input_panel_layer.view_list.link, layer_link.link) - weston_view_unmap(view); + weston_view_move_to_layer(view, NULL); } static void