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

graphic-helpers: prevent multi-rect edges from overlapping

Browse source 
Multi-rect edges overlapping is problematic with translucent colors.
This commit is contained in:
tokyo4j 2024-04-13 22:32:06 +09:00 • committed by Consolatis
parent 3b13f4cdcd
commit 2c0e76417f
1 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/common/graphic-helpers.c
View file

@ -33,7 +33,7 @@ multi_rect_create(struct wlr_scene_tree *parent, float *colors[3], int line_widt
wlr_scene_node_set_position(&rect->top[i]->node, wlr_scene_node_set_position(&rect->top[i]->node,
i * line_width, i * line_width); i * line_width, i * line_width);
wlr_scene_node_set_position(&rect->left[i]->node, wlr_scene_node_set_position(&rect->left[i]->node,
i * line_width, i * line_width); i * line_width, (i + 1) * line_width);
} }
return rect; return rect;
} }
@ -44,10 +44,22 @@ multi_rect_set_size(struct multi_rect *rect, int width, int height)
assert(rect); assert(rect);
int line_width = rect->line_width; int line_width = rect->line_width;
/*
* The outmost outline is drawn like below:
*
* |--width--|
*
* +---------+ ---
* +-+-----+-+ |
* | | | | height
* | | | | |
* +-+-----+-+ |
* +---------+ ---
*/
for (size_t i = 0; i < 3; i++) { for (size_t i = 0; i < 3; i++) {
/* Reposition, top and left don't ever change */ /* Reposition, top and left don't ever change */
wlr_scene_node_set_position(&rect->right[i]->node, wlr_scene_node_set_position(&rect->right[i]->node,
width - (i + 1) * line_width, i * line_width); width - (i + 1) * line_width, (i + 1) * line_width);
wlr_scene_node_set_position(&rect->bottom[i]->node, wlr_scene_node_set_position(&rect->bottom[i]->node,
i * line_width, height - (i + 1) * line_width); i * line_width, height - (i + 1) * line_width);
@ -57,9 +69,9 @@ multi_rect_set_size(struct multi_rect *rect, int width, int height)
wlr_scene_rect_set_size(rect->bottom[i], wlr_scene_rect_set_size(rect->bottom[i],
width - i * line_width * 2, line_width); width - i * line_width * 2, line_width);
wlr_scene_rect_set_size(rect->left[i], wlr_scene_rect_set_size(rect->left[i],
line_width, height - i * line_width * 2); line_width, height - (i + 1) * line_width * 2);
wlr_scene_rect_set_size(rect->right[i], wlr_scene_rect_set_size(rect->right[i],
line_width, height - i * line_width * 2); line_width, height - (i + 1) * line_width * 2);
} }
} }