fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2025-12-20 07:00:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

desktop-shell: Map input panel surfaces before views

Browse source 
Separate the concept of a surface being mapped (where it has current
content) from views being mapped (visible on a layer).

Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Daniel Stone 2023-07-14 08:28:32 +01:00 • committed by Marius Vlad
parent ecc0d40314
commit bdf2019ec9
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
desktop-shell/input-panel.c
View file

@ -89,6 +89,9 @@ show_input_panel_surface(struct input_panel_surface *ipsurf)
struct weston_surface *focus; struct weston_surface *focus;
struct weston_coord_global pos; struct weston_coord_global pos;
if (!weston_surface_is_mapped(ipsurf->surface))
return;
wl_list_for_each(seat, &shell->compositor->seat_list, link) { wl_list_for_each(seat, &shell->compositor->seat_list, link) {
struct weston_keyboard *keyboard = struct weston_keyboard *keyboard =
weston_seat_get_keyboard(seat); weston_seat_get_keyboard(seat);
@ -105,7 +108,6 @@ show_input_panel_surface(struct input_panel_surface *ipsurf)
weston_view_set_position(ipsurf->view, pos); weston_view_set_position(ipsurf->view, pos);
} }
weston_surface_map(ipsurf->surface);
weston_view_move_to_layer(ipsurf->view, weston_view_move_to_layer(ipsurf->view,
&shell->input_panel_layer.view_list); &shell->input_panel_layer.view_list);
@ -139,9 +141,6 @@ show_input_panels(struct wl_listener *listener, void *data)
wl_list_for_each_safe(ipsurf, next, wl_list_for_each_safe(ipsurf, next,
&shell->input_panel.surfaces, link) { &shell->input_panel.surfaces, link) {
if (ipsurf->surface->width == 0)
continue;
show_input_panel_surface(ipsurf); show_input_panel_surface(ipsurf);
} }
} }
@ -192,16 +191,20 @@ input_panel_committed(struct weston_surface *surface,
struct desktop_shell *shell = ip_surface->shell; struct desktop_shell *shell = ip_surface->shell;
struct weston_coord_global pos; struct weston_coord_global pos;
if (surface->width == 0) if (!weston_surface_has_content(surface))
return; return;
if (calc_input_panel_position(ip_surface, &pos)) if (calc_input_panel_position(ip_surface, &pos))
return; return;
weston_view_set_position(ip_surface->view, pos); if (!weston_surface_is_mapped(surface)) {
weston_surface_map(surface);
if (!weston_surface_is_mapped(surface) && shell->showing_input_panels) if (shell->showing_input_panels)
show_input_panel_surface(ip_surface); show_input_panel_surface(ip_surface);
}
weston_view_set_position(ip_surface->view, pos);
} }
static void static void