mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-03-09 05:33:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

cycle: use dummy node to remember the scene position of previewed window

Browse source 
With this approach, we only need to store cycle->dummy_node instead of
cycle->preview_anchor and cycle->preview_parent and we don't need to care
about annoying cases like when the previewed window has no siblings or
when a window tracked by cycle->preview_anchor is destroyed.
This commit is contained in:
tokyo4j 2025-11-30 20:05:42 +09:00 • committed by Hiroaki Yamamoto
parent c1f3286cfe
commit 2b28c41b23
2 changed files with 14 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/labwc.h
View file

@ -306,8 +306,7 @@ struct server {
bool preview_was_shaded; bool preview_was_shaded;
bool preview_was_enabled; bool preview_was_enabled;
struct wlr_scene_node *preview_node; struct wlr_scene_node *preview_node;
struct wlr_scene_tree *preview_parent; struct wlr_scene_node *preview_dummy;
struct wlr_scene_node *preview_anchor;
struct lab_scene_rect *preview_outline; struct lab_scene_rect *preview_outline;
} cycle; } cycle;

47
src/cycle/cycle.c
View file

@ -133,17 +133,6 @@ cycle_on_view_destroy(struct view *view)
destroy_osd_scenes(server); destroy_osd_scenes(server);
update_cycle(server); update_cycle(server);
} }
if (view->scene_tree) {
struct wlr_scene_node *node = &view->scene_tree->node;
if (cycle->preview_anchor == node) {
/*
* If we are the anchor for the current OSD selected view,
* replace the anchor with the node before us.
*/
cycle->preview_anchor = lab_wlr_scene_get_prev_node(node);
}
}
} }
void void
@ -161,15 +150,10 @@ restore_preview_node(struct server *server)
{ {
if (server->cycle.preview_node) { if (server->cycle.preview_node) {
wlr_scene_node_reparent(server->cycle.preview_node, wlr_scene_node_reparent(server->cycle.preview_node,
server->cycle.preview_parent); server->cycle.preview_dummy->parent);
wlr_scene_node_place_above(server->cycle.preview_node,
if (server->cycle.preview_anchor) { server->cycle.preview_dummy);
wlr_scene_node_place_above(server->cycle.preview_node, wlr_scene_node_destroy(server->cycle.preview_dummy);
server->cycle.preview_anchor);
} else {
/* Selected view was the first node */
wlr_scene_node_lower_to_bottom(server->cycle.preview_node);
}
/* Node was disabled / minimized before, disable again */ /* Node was disabled / minimized before, disable again */
if (!server->cycle.preview_was_enabled) { if (!server->cycle.preview_was_enabled) {
@ -180,8 +164,7 @@ restore_preview_node(struct server *server)
view_set_shade(view, true); view_set_shade(view, true);
} }
server->cycle.preview_node = NULL; server->cycle.preview_node = NULL;
server->cycle.preview_parent = NULL; server->cycle.preview_dummy = NULL;
server->cycle.preview_anchor = NULL;
server->cycle.preview_was_shaded = false; server->cycle.preview_was_shaded = false;
} }
} }
@ -227,7 +210,7 @@ cycle_finish(struct server *server, bool switch_focus)
struct view *selected_view = server->cycle.selected_view; struct view *selected_view = server->cycle.selected_view;
server->cycle.preview_node = NULL; server->cycle.preview_node = NULL;
server->cycle.preview_anchor = NULL; server->cycle.preview_dummy = NULL;
server->cycle.selected_view = NULL; server->cycle.selected_view = NULL;
server->cycle.preview_was_shaded = false; server->cycle.preview_was_shaded = false;
@ -261,22 +244,18 @@ preview_selected_view(struct view *view)
/* Move previous selected node back to its original place */ /* Move previous selected node back to its original place */
restore_preview_node(server); restore_preview_node(server);
/* Store some pointers so we can reset the preview later on */
cycle->preview_node = &view->scene_tree->node; cycle->preview_node = &view->scene_tree->node;
cycle->preview_parent = view->scene_tree->node.parent;
/* Remember the sibling right before the selected node */ /* Create a dummy node at the original place of the previewed window */
cycle->preview_anchor = lab_wlr_scene_get_prev_node( struct wlr_scene_rect *dummy_rect = wlr_scene_rect_create(
cycle->preview_node); cycle->preview_node->parent, 0, 0, (float [4]) {0});
while (cycle->preview_anchor && !cycle->preview_anchor->data) { wlr_scene_node_place_below(&dummy_rect->node, cycle->preview_node);
/* Ignore non-view nodes */ wlr_scene_node_set_enabled(&dummy_rect->node, false);
cycle->preview_anchor = lab_wlr_scene_get_prev_node( cycle->preview_dummy = &dummy_rect->node;
cycle->preview_anchor);
}
/* Store node enabled / minimized state and force-enable if disabled */ /* Store node enabled / minimized state and force-enable if disabled */
cycle->preview_was_enabled = cycle->preview_node->enabled; cycle->preview_was_enabled = cycle->preview_node->enabled;
wlr_scene_node_set_enabled(cycle->preview_node, true); wlr_scene_node_set_enabled(cycle->preview_node, true);
if (rc.window_switcher.unshade && view->shaded) { if (rc.window_switcher.unshade && view->shaded) {
view_set_shade(view, false); view_set_shade(view, false);
cycle->preview_was_shaded = true; cycle->preview_was_shaded = true;