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

src/theme.c: use rounded hover overlays

Browse source 
Fixes: #1504
This commit is contained in:
Consolatis 2024-02-04 23:08:05 +01:00
parent e52ccfbcf3
commit bfd9437fc4
1 changed files with 61 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

81
src/theme.c
View file

@ -47,6 +47,23 @@ struct button {
} active, inactive; } active, inactive;
}; };
enum corner {
LAB_CORNER_UNKNOWN = 0,
LAB_CORNER_TOP_LEFT,
LAB_CORNER_TOP_RIGHT,
};
struct rounded_corner_ctx {
struct wlr_box *box;
double radius;
double line_width;
float *fill_color;
float *border_color;
enum corner corner;
};
static struct lab_data_buffer *rounded_rect(struct rounded_corner_ctx *ctx);
static void static void
drop(struct lab_data_buffer **buffer) drop(struct lab_data_buffer **buffer)
{ {
@ -56,10 +73,29 @@ drop(struct lab_data_buffer **buffer)
} }
} }
static enum corner
corner_from_icon_name(const char *icon_name)
{
assert(icon_name);
/*
* TODO: Once we implement titleLayout we can make the
* return values depend on parsed config values.
*/
if (!strcmp(icon_name, "menu")) {
return LAB_CORNER_TOP_LEFT;
} else if (!strcmp(icon_name, "close")) {
return LAB_CORNER_TOP_RIGHT;
}
return LAB_CORNER_UNKNOWN;
}
static void static void
create_hover_fallback(struct theme *theme, struct lab_data_buffer **hover_buffer, create_hover_fallback(struct theme *theme, const char *icon_name,
struct lab_data_buffer **hover_buffer,
struct lab_data_buffer *icon_buffer) struct lab_data_buffer *icon_buffer)
{ {
assert(icon_name);
assert(icon_buffer); assert(icon_buffer);
assert(!*hover_buffer); assert(!*hover_buffer);
@ -68,7 +104,6 @@ create_hover_fallback(struct theme *theme, struct lab_data_buffer **hover_buffer
int icon_width = cairo_image_surface_get_width(icon.surface); int icon_width = cairo_image_surface_get_width(icon.surface);
int icon_height = cairo_image_surface_get_height(icon.surface); int icon_height = cairo_image_surface_get_height(icon.surface);
/* TODO: need to somehow respect rounded corners */
int width = SSD_BUTTON_WIDTH; int width = SSD_BUTTON_WIDTH;
int height = theme->title_height; int height = theme->title_height;
@ -101,9 +136,28 @@ create_hover_fallback(struct theme *theme, struct lab_data_buffer **hover_buffer
cairo_paint(cairo); cairo_paint(cairo);
/* Overlay (non-multiplied alpha) */ /* Overlay (non-multiplied alpha) */
set_cairo_color(cairo, (float[4]) { 0.5f, 0.5f, 0.5f, 0.3f}); float overlay_color[4] = { 0.5f, 0.5f, 0.5f, 0.3f};
cairo_rectangle(cairo, 0, 0, width, height); enum corner corner = corner_from_icon_name(icon_name);
cairo_fill(cairo);
if (corner == LAB_CORNER_UNKNOWN) {
set_cairo_color(cairo, overlay_color);
cairo_rectangle(cairo, 0, 0, width, height);
cairo_fill(cairo);
} else {
struct rounded_corner_ctx rounded_ctx = {
.box = &(struct wlr_box) { .width = width, .height = height },
.radius = rc.corner_radius,
.line_width = theme->border_width,
.fill_color = overlay_color,
.border_color = overlay_color,
.corner = corner
};
struct lab_data_buffer *overlay_buffer = rounded_rect(&rounded_ctx);
cairo_set_source_surface(cairo,
cairo_get_target(overlay_buffer->cairo), 0, 0);
cairo_paint(cairo);
wlr_buffer_drop(&overlay_buffer->base);
}
cairo_surface_flush(surf); cairo_surface_flush(surf);
if (icon.is_duplicate) { if (icon.is_duplicate) {
@ -306,12 +360,12 @@ load_buttons(struct theme *theme)
struct button *base = &buttons[j]; struct button *base = &buttons[j];
if (!strcmp(basename, base->name)) { if (!strcmp(basename, base->name)) {
if (!*hover_button->active.buffer) { if (!*hover_button->active.buffer) {
create_hover_fallback(theme, create_hover_fallback(theme, basename,
hover_button->active.buffer, hover_button->active.buffer,
*base->active.buffer); *base->active.buffer);
} }
if (!*hover_button->inactive.buffer) { if (!*hover_button->inactive.buffer) {
create_hover_fallback(theme, create_hover_fallback(theme, basename,
hover_button->inactive.buffer, hover_button->inactive.buffer,
*base->inactive.buffer); *base->inactive.buffer);
} }
@ -697,19 +751,6 @@ theme_read(struct theme *theme, struct wl_list *paths)
} }
} }
struct rounded_corner_ctx {
struct wlr_box *box;
double radius;
double line_width;
float *fill_color;
float *border_color;
enum {
LAB_CORNER_UNKNOWN = 0,
LAB_CORNER_TOP_LEFT,
LAB_CORNER_TOP_RIGHT,
} corner;
};
static struct lab_data_buffer * static struct lab_data_buffer *
rounded_rect(struct rounded_corner_ctx *ctx) rounded_rect(struct rounded_corner_ctx *ctx)
{ {