layers: arrange layers on output-layout change

This commit is contained in:
Johan Malm 2022-03-02 20:25:57 +00:00
parent 99361d6ad8
commit 04580fa825
2 changed files with 8 additions and 9 deletions

View file

@ -156,6 +156,7 @@ output_init(struct server *server)
wlr_log(WLR_ERROR, "unable to create output layout"); wlr_log(WLR_ERROR, "unable to create output layout");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
wlr_scene_attach_output_layout(server->scene, server->output_layout);
/* Enable screen recording with wf-recorder */ /* Enable screen recording with wf-recorder */
wlr_xdg_output_manager_v1_create(server->wl_display, wlr_xdg_output_manager_v1_create(server->wl_display,
@ -319,12 +320,11 @@ handle_output_layout_change(struct wl_listener *listener, void *data)
} }
struct output *output; struct output *output;
/* FIXME: Sort this out */ wl_list_for_each(output, &server->outputs, link) {
// wl_list_for_each(output, &server->outputs, link) { if (output) {
// if (output) { arrange_layers(output);
// arrange_layers(output); }
// } }
// }
output_update_for_layout_change(server); output_update_for_layout_change(server);
} }
} }

View file

@ -216,8 +216,6 @@ server_init(struct server *server)
wl_list_init(&server->views); wl_list_init(&server->views);
wl_list_init(&server->unmanaged_surfaces); wl_list_init(&server->unmanaged_surfaces);
output_init(server);
server->scene = wlr_scene_create(); server->scene = wlr_scene_create();
if (!server->scene) { if (!server->scene) {
wlr_log(WLR_ERROR, "unable to create scene"); wlr_log(WLR_ERROR, "unable to create scene");
@ -229,7 +227,8 @@ server_init(struct server *server)
#endif #endif
server->menu_tree = wlr_scene_tree_create(&server->scene->node); server->menu_tree = wlr_scene_tree_create(&server->scene->node);
server->osd_tree = wlr_scene_tree_create(&server->scene->node); server->osd_tree = wlr_scene_tree_create(&server->scene->node);
wlr_scene_attach_output_layout(server->scene, server->output_layout);
output_init(server);
/* /*
* Create some hands-off wlroots interfaces. The compositor is * Create some hands-off wlroots interfaces. The compositor is