csd: buttons: use default color table as default colors

If the user hasn't configured any CSD button colors, use the color
scheme's default colors for blue/green/red.
This commit is contained in:
Daniel Eklöf 2020-04-29 20:06:16 +02:00
parent 02d4a093bb
commit 74d30dc410
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 9 additions and 6 deletions

View file

@ -151,13 +151,16 @@ component.
minimize/maximize/close buttons. Default: _26_. minimize/maximize/close buttons. Default: _26_.
*button-minimize-color* *button-minimize-color*
Minimize button's AARRGGBB color. Default: _ff1e90ff_. Minimize button's AARRGGBB color. Default: use the default
_regular4_ color (blue).
*button-maximize-color* *button-maximize-color*
Maximize button's AARRGGBB color. Default: _ff30ff30_. Maximize button's AARRGGBB color. Default: use the default
_regular2_ color (green).
*button-close-color* *button-close-color*
Close button's AARRGGBB color. Default: _ffff3030_. Close button's AARRGGBB color. Default: use the default _regular1_
color (red).
# SECTION: key-bindings # SECTION: key-bindings

View file

@ -1108,21 +1108,21 @@ render_csd_button(struct terminal *term, enum csd_surface surf_idx)
switch (surf_idx) { switch (surf_idx) {
case CSD_SURF_MINIMIZE: case CSD_SURF_MINIMIZE:
_color = 0xff1e90ff; _color = term->colors.default_table[4]; /* blue */
is_set = &term->conf->csd.color.minimize_set; is_set = &term->conf->csd.color.minimize_set;
conf_color = &term->conf->csd.color.minimize; conf_color = &term->conf->csd.color.minimize;
is_active = term->active_surface == TERM_SURF_BUTTON_MINIMIZE; is_active = term->active_surface == TERM_SURF_BUTTON_MINIMIZE;
break; break;
case CSD_SURF_MAXIMIZE: case CSD_SURF_MAXIMIZE:
_color = 0xff30ff30; _color = term->colors.default_table[2]; /* green */
is_set = &term->conf->csd.color.maximize_set; is_set = &term->conf->csd.color.maximize_set;
conf_color = &term->conf->csd.color.maximize; conf_color = &term->conf->csd.color.maximize;
is_active = term->active_surface == TERM_SURF_BUTTON_MAXIMIZE; is_active = term->active_surface == TERM_SURF_BUTTON_MAXIMIZE;
break; break;
case CSD_SURF_CLOSE: case CSD_SURF_CLOSE:
_color = 0xffff3030; _color = term->colors.default_table[1]; /* red */
is_set = &term->conf->csd.color.close_set; is_set = &term->conf->csd.color.close_set;
conf_color = &term->conf->csd.color.close; conf_color = &term->conf->csd.color.close;
is_active = term->active_surface == TERM_SURF_BUTTON_CLOSE; is_active = term->active_surface == TERM_SURF_BUTTON_CLOSE;