mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

osd: destroy old osd_tree children

Browse source
This commit is contained in:
Johan Malm 2022-02-12 22:04:27 +00:00
parent 5934ed6682
commit 4593909744
2 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/keyboard.c
View file

@ -50,8 +50,7 @@ keyboard_modifiers_notify(struct wl_listener *listener, void *data)
server->cycle_view);
desktop_move_to_front(server->cycle_view);
server->cycle_view = NULL;
wlr_scene_node_set_enabled(
&server->osd_tree->node, false);
osd_finish(server);
}
}

19
src/osd.c
View file

@ -74,11 +74,29 @@ get_osd_height(struct wl_list *views)
return height;
}
static void
destroy_osd_nodes(struct server *server)
{
struct wlr_scene_node *child, *next;
struct wl_list *children = &server->osd_tree->node.state.children;
wl_list_for_each_safe(child, next, children, state.link) {
wlr_scene_node_destroy(child);
}
}
void
osd_finish(struct server *server)
{
destroy_osd_nodes(server);
wlr_scene_node_set_enabled(&server->osd_tree->node, false);
}
void
osd_update(struct server *server)
{
struct theme *theme = server->theme;
destroy_osd_nodes(server);
struct output *output;
wl_list_for_each(output, &server->outputs, link) {
float scale = output->wlr_output->scale;
@ -176,7 +194,6 @@ osd_update(struct server *server)
pango_cairo_show_layout(cairo, layout);
y += OSD_ITEM_HEIGHT;
}
g_object_unref(layout);
cairo_surface_flush(surf);