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

src/theme.c: minor code improvements

Browse source
This commit is contained in:
Consolatis 2024-02-05 15:16:16 +01:00
parent bfd9437fc4
commit e480c57445
1 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/theme.c
View file

@ -65,7 +65,7 @@ struct rounded_corner_ctx {
static struct lab_data_buffer *rounded_rect(struct rounded_corner_ctx *ctx); static struct lab_data_buffer *rounded_rect(struct rounded_corner_ctx *ctx);
static void static void
drop(struct lab_data_buffer **buffer) zdrop(struct lab_data_buffer **buffer)
{ {
if (*buffer) { if (*buffer) {
wlr_buffer_drop(&(*buffer)->base); wlr_buffer_drop(&(*buffer)->base);
@ -275,8 +275,8 @@ load_buttons(struct theme *theme)
for (size_t i = 0; i < ARRAY_SIZE(buttons); ++i) { for (size_t i = 0; i < ARRAY_SIZE(buttons); ++i) {
struct button *b = &buttons[i]; struct button *b = &buttons[i];
drop(b->active.buffer); zdrop(b->active.buffer);
drop(b->inactive.buffer); zdrop(b->inactive.buffer);
/* PNG */ /* PNG */
snprintf(filename, sizeof(filename), "%s-active.png", b->name); snprintf(filename, sizeof(filename), "%s-active.png", b->name);
@ -342,7 +342,7 @@ load_buttons(struct theme *theme)
} }
/* /*
* If hover-icons do not exist, add fallbacks by coping the non-hover * If hover-icons do not exist, add fallbacks by copying the non-hover
* variant (base) and then adding an overlay. * variant (base) and then adding an overlay.
*/ */
for (size_t i = 0; i < ARRAY_SIZE(buttons); i++) { for (size_t i = 0; i < ARRAY_SIZE(buttons); i++) {
@ -767,7 +767,7 @@ rounded_rect(struct rounded_corner_ctx *ctx)
struct lab_data_buffer *buffer; struct lab_data_buffer *buffer;
/* TODO: scale */ /* TODO: scale */
buffer = buffer_create_cairo(w, h, 1, true); buffer = buffer_create_cairo(w, h, 1, /*free_on_destroy*/ true);
cairo_t *cairo = buffer->cairo; cairo_t *cairo = buffer->cairo;
cairo_surface_t *surf = cairo_get_target(cairo); cairo_surface_t *surf = cairo_get_target(cairo);
@ -1037,12 +1037,8 @@ theme_init(struct theme *theme, const char *theme_name)
void void
theme_finish(struct theme *theme) theme_finish(struct theme *theme)
{ {
wlr_buffer_drop(&theme->corner_top_left_active_normal->base); zdrop(&theme->corner_top_left_active_normal);
wlr_buffer_drop(&theme->corner_top_left_inactive_normal->base); zdrop(&theme->corner_top_left_inactive_normal);
wlr_buffer_drop(&theme->corner_top_right_active_normal->base); zdrop(&theme->corner_top_right_active_normal);
wlr_buffer_drop(&theme->corner_top_right_inactive_normal->base); zdrop(&theme->corner_top_right_inactive_normal);
theme->corner_top_left_active_normal = NULL;
theme->corner_top_left_inactive_normal = NULL;
theme->corner_top_right_active_normal = NULL;
theme->corner_top_right_inactive_normal = NULL;
} }