diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-12-23 10:54:50 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-12-23 10:54:50 +0000 |
| commit | a20e424dc0685275a9ac5c448e7f20c5738fc8b9 (patch) | |
| tree | 5d5fe7c4fcbc748a0fa7858c979dba8c43f9dbea /config.c | |
| parent | meson: generate-version: use CURRENT_SOURCE_DIR instead of SOURCE_ROOT (diff) | |
| parent | render: make sure ‘maximized’ button doesn’t use negative coordinates (diff) | |
Merge branch 'crash-on-csd-size-1'
Closes #857
Diffstat (limited to 'config.c')
| -rw-r--r-- | config.c | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -32,6 +32,8 @@ static const uint32_t default_foreground = 0xdcdccc; static const uint32_t default_background = 0x111111; +static const size_t min_csd_border_width = 5; + #define cube6(r, g) \ r|g|0x00, r|g|0x5f, r|g|0x87, r|g|0xaf, r|g|0xd7, r|g|0xff @@ -2802,6 +2804,7 @@ config_load(struct config *conf, const char *conf_path, .font = {0}, .title_height = 26, .border_width = 5, + .border_width_visible = 0, .button_width = 26, }, @@ -3009,6 +3012,9 @@ config_override_apply(struct config *conf, config_override_t *overrides, } } + conf->csd.border_width = max( + min_csd_border_width, conf->csd.border_width_visible); + return true; } |
