mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-02-18 22:05:32 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

theme: move title_height to theme struct

Browse source 
title_height is a derived variable which needs both config and theme
variables (font height and title padding). The code is tidier calling
post_processing() for this from theme_init()
This commit is contained in:
Johan Malm 2021-04-15 20:13:49 +01:00
parent 85c775c3b1
commit 2f5a44d34d
5 changed files with 46 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/theme.c
View file

@ -7,9 +7,11 @@
#include <string.h>
#include "common/dir.h"
#include "common/font.h"
#include "common/log.h"
#include "common/string-helpers.h"
#include "common/zfree.h"
#include "config/rcxml.h"
#include "theme.h"
#include "xbm/xbm.h"
@ -64,6 +66,7 @@ parse_hexstr(const char *hex, float *rgba)
void theme_builtin(struct theme *theme)
{
theme->border_width = 1;
theme->padding_height = 3;
parse_hexstr("#dddad6", theme->window_active_border_color);
parse_hexstr("#f6f5f4", theme->window_inactive_border_color);
@ -99,6 +102,9 @@ static void entry(struct theme *theme, const char *key, const char *value)
if (match(key, "border.width")) {
theme->border_width = atoi(value);
}
if (match(key, "padding.height")) {
theme->padding_height = atoi(value);
}
if (match(key, "window.active.border.color")) {
parse_hexstr(value, theme->window_active_border_color);
@ -188,12 +194,27 @@ theme_read(struct theme *theme, const char *theme_name)
fclose(stream);
}
static void
post_processing(struct theme *theme)
{
char buf[256];
snprintf(buf, sizeof(buf), "%s %d", rc.font_name_activewindow,
rc.font_size_activewindow);
theme->title_height = font_height(buf) + 2 * theme->padding_height;
if (rc.corner_radius >= theme->title_height) {
theme->title_height = rc.corner_radius + 1;
}
}
void
theme_init(struct theme *theme, struct wlr_renderer *renderer,
const char *theme_name)
{
theme_read(theme, theme_name);
xbm_load(theme, renderer);
post_processing(theme);
}
void