mirror of
https://github.com/labwc/labwc.git
synced 2026-04-08 08:21:09 -04:00
Fix residue of plain borders left during a reload
This commit is contained in:
parent
c2e251de98
commit
476626b7b5
1 changed files with 24 additions and 20 deletions
|
|
@ -38,24 +38,20 @@ ssd_border_create(struct ssd *ssd)
|
||||||
struct wlr_scene_tree *parent = subtree->tree;
|
struct wlr_scene_tree *parent = subtree->tree;
|
||||||
wlr_scene_node_set_enabled(&parent->node, active);
|
wlr_scene_node_set_enabled(&parent->node, active);
|
||||||
float *color = theme->window[active].border_color;
|
float *color = theme->window[active].border_color;
|
||||||
|
|
||||||
|
|
||||||
subtree->left = lab_wlr_scene_rect_create(parent,
|
|
||||||
theme->border_width, height, color);
|
|
||||||
|
|
||||||
subtree->right = lab_wlr_scene_rect_create(parent,
|
|
||||||
theme->border_width, height, color);
|
|
||||||
|
|
||||||
subtree->bottom = lab_wlr_scene_rect_create(parent,
|
|
||||||
full_width, theme->border_width, color);
|
|
||||||
|
|
||||||
subtree->top = lab_wlr_scene_rect_create(parent,
|
|
||||||
MAX(width - 2 * corner_width, 0), theme->border_width, color);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (theme->beveled_border) {
|
if (theme->beveled_border) {
|
||||||
|
|
||||||
|
// These will otherwise get left under the window when we reload
|
||||||
|
|
||||||
|
subtree->left = lab_wlr_scene_rect_create(parent, 1, 1, color);
|
||||||
|
|
||||||
|
|
||||||
|
subtree->right = lab_wlr_scene_rect_create(parent, 1, 1, color);
|
||||||
|
|
||||||
|
subtree->bottom = lab_wlr_scene_rect_create(parent, 1, 1, color);
|
||||||
|
|
||||||
|
subtree->top = lab_wlr_scene_rect_create(parent, 1, 1, color);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
int bevelSize = theme->border_bevel_width; // TODO: configurable
|
int bevelSize = theme->border_bevel_width; // TODO: configurable
|
||||||
|
|
||||||
|
|
@ -239,11 +235,19 @@ ssd_border_create(struct ssd *ssd)
|
||||||
4*theme->border_width);
|
4*theme->border_width);
|
||||||
subtree->brcorner = wlr_scene_buffer_create(parent, &brtexture_buffer->base);
|
subtree->brcorner = wlr_scene_buffer_create(parent, &brtexture_buffer->base);
|
||||||
wlr_buffer_drop(&brtexture_buffer->base);
|
wlr_buffer_drop(&brtexture_buffer->base);
|
||||||
}
|
} else {
|
||||||
|
|
||||||
|
subtree->left = lab_wlr_scene_rect_create(parent,
|
||||||
|
theme->border_width, height, color);
|
||||||
|
|
||||||
|
subtree->right = lab_wlr_scene_rect_create(parent,
|
||||||
|
theme->border_width, height, color);
|
||||||
|
|
||||||
if (!theme->beveled_border) {
|
subtree->bottom = lab_wlr_scene_rect_create(parent,
|
||||||
|
full_width, theme->border_width, color);
|
||||||
|
|
||||||
|
subtree->top = lab_wlr_scene_rect_create(parent,
|
||||||
|
MAX(width - 2 * corner_width, 0), theme->border_width, color);
|
||||||
wlr_scene_node_set_position(&subtree->left->node, 0, 0);
|
wlr_scene_node_set_position(&subtree->left->node, 0, 0);
|
||||||
wlr_scene_node_set_position(&subtree->right->node,
|
wlr_scene_node_set_position(&subtree->right->node,
|
||||||
theme->border_width + width, 0);
|
theme->border_width + width, 0);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue