mainnika
/
weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

desktop-shell: Re-position views when outputs change

Browse Source 
When the last output is destroyed or when a new output is created after
the last output is destroyed, we need to re-position the views to ensure
that all the views are displayed on the output.

Fixes: https://gitlab.freedesktop.org/wayland/weston/issues/210

Signed-off-by: Harish Krupo <harishkrupo@gmail.com>
dev
Harish Krupo 6 years ago committed by Daniel Stone
parent 2dff4dd695
commit dc3edc04aa
1 changed files with 9 additions and 4 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 13
      desktop-shell/shell.c

13
desktop-shell/shell.c
Unescape View File

@ -4724,7 +4724,7 @@ workspace_move_surface_down_binding(struct weston_keyboard *keyboard,
} }
static void static void
shell_reposition_view_on_output_destroy(struct weston_view *view) shell_reposition_view_on_output_change(struct weston_view *view)
{ {
struct weston_output *output, *first_output; struct weston_output *output, *first_output;
struct weston_compositor *ec = view->surface->compositor; struct weston_compositor *ec = view->surface->compositor;
@ -4789,14 +4789,15 @@ shell_for_each_layer(struct desktop_shell *shell,
} }
static void static void
shell_output_destroy_move_layer(struct desktop_shell *shell, shell_output_changed_move_layer(struct desktop_shell *shell,
struct weston_layer *layer, struct weston_layer *layer,
void *data) void *data)
{ {
struct weston_view *view; struct weston_view *view;
wl_list_for_each(view, &layer->view_list.link, layer_link.link) wl_list_for_each(view, &layer->view_list.link, layer_link.link)
shell_reposition_view_on_output_destroy(view); shell_reposition_view_on_output_change(view);
} }
static void static void
@ -4806,7 +4807,7 @@ handle_output_destroy(struct wl_listener *listener, void *data)
container_of(listener, struct shell_output, destroy_listener); container_of(listener, struct shell_output, destroy_listener);
struct desktop_shell *shell = output_listener->shell; struct desktop_shell *shell = output_listener->shell;
shell_for_each_layer(shell, shell_output_destroy_move_layer, NULL); shell_for_each_layer(shell, shell_output_changed_move_layer, NULL);
if (output_listener->panel_surface) if (output_listener->panel_surface)
wl_list_remove(&output_listener->panel_surface_listener.link); wl_list_remove(&output_listener->panel_surface_listener.link);
@ -4860,6 +4861,10 @@ create_shell_output(struct desktop_shell *shell,
wl_signal_add(&output->destroy_signal, wl_signal_add(&output->destroy_signal,
&shell_output->destroy_listener); &shell_output->destroy_listener);
wl_list_insert(shell->output_list.prev, &shell_output->link); wl_list_insert(shell->output_list.prev, &shell_output->link);
if (wl_list_length(&shell->output_list) == 1)
shell_for_each_layer(shell,
shell_output_changed_move_layer, NULL);
} }
static void static void

Write Preview
Loading…
Cancel
Save