mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-07 08:21:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bevels on OSD popup are now controlled by the toggle and honour the specified width

Browse source
This commit is contained in:
Jack Zeal 2026-03-25 21:36:57 -07:00
parent 69e372cc5f
commit 8c46add98a
1 changed files with 42 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/workspaces.c
View file

@ -103,33 +103,49 @@ _osd_update(void)
cairo_rectangle(cairo, 0, 0, width, height); cairo_rectangle(cairo, 0, 0, width, height);
cairo_fill(cairo); cairo_fill(cairo);
/* Border */ /* Border */
if (theme->beveled_border) {
const float highlight[4] = { const float highlight[4] = {
theme->osd_bg_color[0] * 1.25, MIN(theme->osd_border_color[0] * 5/4, theme->osd_border_color[3]),
theme->osd_bg_color[1] * 1.25, MIN(theme->osd_border_color[1] * 5/4, theme->osd_border_color[3]),
theme->osd_bg_color[2] * 1.25, MIN(theme->osd_border_color[2] * 5/4, theme->osd_border_color[3]),
theme->osd_bg_color[3] theme->osd_border_color[3]
}; };
const float lowlight[4] = { const float lowlight[4] = {
theme->osd_bg_color[0] / 2, theme->osd_border_color[0] / 2,
theme->osd_bg_color[1] / 2, theme->osd_border_color[1] / 2,
theme->osd_bg_color[2] / 2, theme->osd_border_color[2] / 2,
theme->osd_bg_color[3] theme->osd_border_color[3]
}; };
set_cairo_color(cairo, highlight); set_cairo_color(cairo, highlight);
cairo_rectangle(cairo, 0, 0, width, 2); cairo_new_path(cairo);
cairo_fill(cairo); cairo_move_to(cairo, 0, 0);
cairo_rectangle(cairo, 0, 0, 2, height); cairo_line_to(cairo, width, 0);
cairo_line_to(cairo, width - theme->osd_border_width, theme->osd_border_width);
cairo_line_to(cairo, theme->osd_border_width, theme->osd_border_width);
cairo_line_to(cairo, theme->osd_border_width, height-theme->osd_border_width);
cairo_line_to(cairo, 0, height);
cairo_close_path(cairo);
cairo_fill(cairo); cairo_fill(cairo);
set_cairo_color(cairo, lowlight); set_cairo_color(cairo, lowlight);
cairo_rectangle(cairo, width-2, 0, width, height); cairo_new_path(cairo);
cairo_fill(cairo); cairo_move_to(cairo, width, 0);
cairo_rectangle(cairo, 0, height-2, width, height); cairo_line_to(cairo, width - theme->osd_border_width, theme->osd_border_width);
cairo_line_to(cairo, width - theme->osd_border_width, height-theme->osd_border_width);
cairo_line_to(cairo, theme->osd_border_width, height-theme->osd_border_width);
cairo_line_to(cairo, 0, height);
cairo_line_to(cairo, width, height);
cairo_close_path(cairo);
cairo_fill(cairo); cairo_fill(cairo);
} else {
set_cairo_color(cairo, theme->osd_border_color);
struct wlr_fbox border_fbox = {
.width = width,
.height = height,
};
draw_cairo_border(cairo, border_fbox, theme->osd_border_width);
}
/* Boxes */ /* Boxes */