diff options
| -rw-r--r-- | config.c | 2 | ||||
| -rw-r--r-- | config.h | 2 | ||||
| -rw-r--r-- | render.c | 2 | ||||
| -rw-r--r-- | tests/test-config.c | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -1451,7 +1451,7 @@ parse_section_csd(struct context *ctx) } else if (strcmp(key, "button-close-color") == 0) { - if (!value_to_color(ctx, &conf->csd.color.close, true)) + if (!value_to_color(ctx, &conf->csd.color.quit, true)) return false; conf->csd.color.close_set = true; @@ -262,7 +262,7 @@ struct config { uint32_t buttons; uint32_t minimize; uint32_t maximize; - uint32_t close; + uint32_t quit; /* ‘close’ collides with #define in epoll-shim */ uint32_t border; } color; @@ -2052,7 +2052,7 @@ render_csd_button(struct terminal *term, enum csd_surface surf_idx, case CSD_SURF_CLOSE: _color = term->conf->colors.table[1]; /* red */ is_set = term->conf->csd.color.close_set; - conf_color = &term->conf->csd.color.close; + conf_color = &term->conf->csd.color.quit; is_active = term->active_surface == TERM_SURF_BUTTON_CLOSE; break; diff --git a/tests/test-config.c b/tests/test-config.c index be18a593..04149a59 100644 --- a/tests/test-config.c +++ b/tests/test-config.c @@ -665,7 +665,7 @@ test_section_csd(void) test_color(&ctx, &parse_section_csd, "button-maximize-color", true, &conf.csd.color.maximize); test_color(&ctx, &parse_section_csd, "button-close-color", true, - &conf.csd.color.close); + &conf.csd.color.quit); /* TODO: verify the ‘set’ bit is actually set for colors */ /* TODO: font */ |
