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

overlay: refactor

Browse source 
- Use a single `lab_scene_rect` for both overlay background and outlines,
  like I described in the TODO comment in ffd4005.
- Simplify the resource management by destroying the overlay tree when
  it's hidden. I think its overhead is pretty minimal.
- Share a single `lab_scene_rect` for both region/edge overlays.
This commit is contained in:
tokyo4j 2025-08-31 04:41:08 +09:00 • committed by Johan Malm
parent 78d47c5c37
commit 66e26cd28a
8 changed files with 51 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/debug.c
View file

@ -22,7 +22,7 @@
#define IGNORE_SSD true
#define IGNORE_MENU true
#define IGNORE_OSD_PREVIEW_OUTLINE true
#define IGNORE_SNAPPING_PREVIEW_OUTLINE true
#define IGNORE_SNAPPING_OVERLAY true
static struct view *last_view;
@ -141,15 +141,10 @@ get_special(struct server *server, struct wlr_scene_node *node)
if (node == &server->seat.drag.icons->node) {
return "seat->drag.icons";
}
if (server->seat.overlay.region_rect.tree
&& node == &server->seat.overlay.region_rect.tree->node) {
if (server->seat.overlay.rect
&& node == &server->seat.overlay.rect->tree->node) {
/* Created on-demand */
return "seat->overlay.region_rect";
}
if (server->seat.overlay.edge_rect.tree
&& node == &server->seat.overlay.edge_rect.tree->node) {
/* Created on-demand */
return "seat->overlay.edge_rect";
return "seat->overlay.rect";
}
if (server->seat.input_method_relay->popup_tree
&& node == &server->seat.input_method_relay->popup_tree->node) {
@ -224,21 +219,13 @@ dump_tree(struct server *server, struct wlr_scene_node *node,
struct lab_scene_rect *osd_preview_outline =
server->osd_state.preview_outline;
struct lab_scene_rect *region_snapping_overlay_outline =
server->seat.overlay.region_rect.border_rect;
struct lab_scene_rect *edge_snapping_overlay_outline =
server->seat.overlay.edge_rect.border_rect;
if ((IGNORE_MENU && node == &server->menu_tree->node)
|| (IGNORE_SSD && last_view
&& ssd_debug_is_root_node(last_view->ssd, node))
|| (IGNORE_OSD_PREVIEW_OUTLINE && osd_preview_outline
&& node == &osd_preview_outline->tree->node)
|| (IGNORE_SNAPPING_PREVIEW_OUTLINE
&& region_snapping_overlay_outline
&& node == &region_snapping_overlay_outline->tree->node)
|| (IGNORE_SNAPPING_PREVIEW_OUTLINE
&& edge_snapping_overlay_outline
&& node == &edge_snapping_overlay_outline->tree->node)) {
|| (IGNORE_SNAPPING_OVERLAY && server->seat.overlay.rect
&& node == &server->seat.overlay.rect->tree->node)) {
printf("%*c%s\n", pos + 4 + INDENT_SIZE, ' ', "<skipping children>");
return;
}