mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-03 09:01:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

overlay: allow to draw both/either of filled/outlined rectangle

Browse source 
Filled/outlined rectangles shown as snapping overlay are now enabled/disabled
independently with `snapping.overlay.[region|edge].bg.enabled` and
`snapping.overlay.[region|edge].border.enabled`.

To keep the default behavior, `*.bg.enabled` is yes and `*.border.enabled` is
no for hardware-based renderers, while `*.bg.enabled` is no and
`*.border.enabled` is yes for software-based (pixman) renderer.

Users can now use a filled rectangle as an overlay even with pixman renderer.
However, this may severely impact performance when used with translucent
`snapping.overlay.[region|edge].bg.color`.

This commit includes a refactor to use substruct `theme_snapping_overlay`
inside `theme` in order to pass it to `create_overlay_rect()` in a cleaner way.

Breaking changes is:
- `snapping.overlay.[region|edge].fill` is now removed.
This commit is contained in:
tokyo4j 2024-04-21 02:30:31 +09:00 • committed by Johan Malm
parent 34290ef629
commit b0ba585ff8
9 changed files with 160 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/debug.c
View file

@ -138,13 +138,13 @@ 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.node
&& node == server->seat.overlay.region_rect.node) {
if (server->seat.overlay.region_rect.tree
&& node == &server->seat.overlay.region_rect.tree->node) {
/* Created on-demand */
return "seat->overlay.region_rect";
}
if (server->seat.overlay.edge_rect.node
&& node == server->seat.overlay.edge_rect.node) {
if (server->seat.overlay.edge_rect.tree
&& node == &server->seat.overlay.edge_rect.tree->node) {
/* Created on-demand */
return "seat->overlay.edge_rect";
}
@ -219,17 +219,23 @@ dump_tree(struct server *server, struct wlr_scene_node *node,
}
printf("%.*s %*c %4d %4d [%p]\n", max_width - 1, type, padding, ' ', x, y, node);
struct multi_rect *osd_preview_outline =
server->osd_state.preview_outline;
struct multi_rect *region_snapping_overlay_outline =
server->seat.overlay.region_rect.border_rect;
struct multi_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 && server->osd_state.preview_outline
&& node == &server->osd_state.preview_outline->tree->node)
|| (IGNORE_SNAPPING_PREVIEW_OUTLINE && server->seat.overlay.region_rect.node
&& !server->seat.overlay.region_rect.fill
&& node == server->seat.overlay.region_rect.node)
|| (IGNORE_SNAPPING_PREVIEW_OUTLINE && server->seat.overlay.edge_rect.node
&& !server->seat.overlay.edge_rect.fill
&& node == server->seat.overlay.edge_rect.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)) {
printf("%*c%s\n", pos + 4 + INDENT_SIZE, ' ', "<skipping children>");
return;
}