diff options
-rw-r--r-- | include/sway/config.h | 2 | ||||
-rw-r--r-- | sway/commands/client.c | 2 | ||||
-rw-r--r-- | sway/config.c | 10 | ||||
-rw-r--r-- | sway/tree/container.c | 5 |
4 files changed, 10 insertions, 9 deletions
diff --git a/include/sway/config.h b/include/sway/config.h index 3fb820f0..db942c3f 100644 --- a/include/sway/config.h +++ b/include/sway/config.h | |||
@@ -206,7 +206,7 @@ struct bar_config { | |||
206 | struct border_colors { | 206 | struct border_colors { |
207 | float border[4]; | 207 | float border[4]; |
208 | float background[4]; | 208 | float background[4]; |
209 | uint32_t text; // uint32_t because that's the format that cairo uses | 209 | float text[4]; |
210 | float indicator[4]; | 210 | float indicator[4]; |
211 | float child_border[4]; | 211 | float child_border[4]; |
212 | }; | 212 | }; |
diff --git a/sway/commands/client.c b/sway/commands/client.c index 0abd0167..d6b7de1a 100644 --- a/sway/commands/client.c +++ b/sway/commands/client.c | |||
@@ -64,7 +64,7 @@ static struct cmd_results *handle_command(int argc, char **argv, | |||
64 | "Unable to parse background color"); | 64 | "Unable to parse background color"); |
65 | } | 65 | } |
66 | 66 | ||
67 | if (!parse_color_int(argv[2], &class->text)) { | 67 | if (!parse_color_float(argv[2], class->text)) { |
68 | return cmd_results_new(CMD_INVALID, cmd_name, | 68 | return cmd_results_new(CMD_INVALID, cmd_name, |
69 | "Unable to parse text color"); | 69 | "Unable to parse text color"); |
70 | } | 70 | } |
diff --git a/sway/config.c b/sway/config.c index 0ad9c3a2..5efa0d48 100644 --- a/sway/config.c +++ b/sway/config.c | |||
@@ -210,31 +210,31 @@ static void config_defaults(struct sway_config *config) { | |||
210 | set_color(config->border_colors.focused.border, 0x4C7899); | 210 | set_color(config->border_colors.focused.border, 0x4C7899); |
211 | set_color(config->border_colors.focused.border, 0x4C7899); | 211 | set_color(config->border_colors.focused.border, 0x4C7899); |
212 | set_color(config->border_colors.focused.background, 0x285577); | 212 | set_color(config->border_colors.focused.background, 0x285577); |
213 | config->border_colors.focused.text = 0xFFFFFFFF; | 213 | set_color(config->border_colors.focused.text, 0xFFFFFFFF); |
214 | set_color(config->border_colors.focused.indicator, 0x2E9EF4); | 214 | set_color(config->border_colors.focused.indicator, 0x2E9EF4); |
215 | set_color(config->border_colors.focused.child_border, 0x285577); | 215 | set_color(config->border_colors.focused.child_border, 0x285577); |
216 | 216 | ||
217 | set_color(config->border_colors.focused_inactive.border, 0x333333); | 217 | set_color(config->border_colors.focused_inactive.border, 0x333333); |
218 | set_color(config->border_colors.focused_inactive.background, 0x5F676A); | 218 | set_color(config->border_colors.focused_inactive.background, 0x5F676A); |
219 | config->border_colors.focused_inactive.text = 0xFFFFFFFF; | 219 | set_color(config->border_colors.focused_inactive.text, 0xFFFFFFFF); |
220 | set_color(config->border_colors.focused_inactive.indicator, 0x484E50); | 220 | set_color(config->border_colors.focused_inactive.indicator, 0x484E50); |
221 | set_color(config->border_colors.focused_inactive.child_border, 0x5F676A); | 221 | set_color(config->border_colors.focused_inactive.child_border, 0x5F676A); |
222 | 222 | ||
223 | set_color(config->border_colors.unfocused.border, 0x333333); | 223 | set_color(config->border_colors.unfocused.border, 0x333333); |
224 | set_color(config->border_colors.unfocused.background, 0x222222); | 224 | set_color(config->border_colors.unfocused.background, 0x222222); |
225 | config->border_colors.unfocused.text = 0x888888FF; | 225 | set_color(config->border_colors.unfocused.text, 0xFFFFFFFF); |
226 | set_color(config->border_colors.unfocused.indicator, 0x292D2E); | 226 | set_color(config->border_colors.unfocused.indicator, 0x292D2E); |
227 | set_color(config->border_colors.unfocused.child_border, 0x222222); | 227 | set_color(config->border_colors.unfocused.child_border, 0x222222); |
228 | 228 | ||
229 | set_color(config->border_colors.urgent.border, 0x2F343A); | 229 | set_color(config->border_colors.urgent.border, 0x2F343A); |
230 | set_color(config->border_colors.urgent.background, 0x900000); | 230 | set_color(config->border_colors.urgent.background, 0x900000); |
231 | config->border_colors.urgent.text = 0xFFFFFFFF; | 231 | set_color(config->border_colors.urgent.text, 0xFFFFFFFF); |
232 | set_color(config->border_colors.urgent.indicator, 0x900000); | 232 | set_color(config->border_colors.urgent.indicator, 0x900000); |
233 | set_color(config->border_colors.urgent.child_border, 0x900000); | 233 | set_color(config->border_colors.urgent.child_border, 0x900000); |
234 | 234 | ||
235 | set_color(config->border_colors.placeholder.border, 0x000000); | 235 | set_color(config->border_colors.placeholder.border, 0x000000); |
236 | set_color(config->border_colors.placeholder.background, 0x0C0C0C); | 236 | set_color(config->border_colors.placeholder.background, 0x0C0C0C); |
237 | config->border_colors.placeholder.text = 0xFFFFFFFF; | 237 | set_color(config->border_colors.placeholder.text, 0xFFFFFFFF); |
238 | set_color(config->border_colors.placeholder.indicator, 0x000000); | 238 | set_color(config->border_colors.placeholder.indicator, 0x000000); |
239 | set_color(config->border_colors.placeholder.child_border, 0x0C0C0C); | 239 | set_color(config->border_colors.placeholder.child_border, 0x0C0C0C); |
240 | 240 | ||
diff --git a/sway/tree/container.c b/sway/tree/container.c index d89019a3..90ca9b2c 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c | |||
@@ -585,9 +585,10 @@ static void update_title_texture(struct sway_container *con, | |||
585 | cairo_set_source_rgba(cairo, class->background[0], class->background[1], | 585 | cairo_set_source_rgba(cairo, class->background[0], class->background[1], |
586 | class->background[2], class->background[3]); | 586 | class->background[2], class->background[3]); |
587 | cairo_paint(cairo); | 587 | cairo_paint(cairo); |
588 | cairo_set_antialias(cairo, CAIRO_ANTIALIAS_BEST); | ||
589 | PangoContext *pango = pango_cairo_create_context(cairo); | 588 | PangoContext *pango = pango_cairo_create_context(cairo); |
590 | cairo_set_source_u32(cairo, class->text); | 589 | cairo_set_antialias(cairo, CAIRO_ANTIALIAS_BEST); |
590 | cairo_set_source_rgba(cairo, class->text[0], class->text[1], | ||
591 | class->text[2], class->text[3]); | ||
591 | cairo_move_to(cairo, 0, 0); | 592 | cairo_move_to(cairo, 0, 0); |
592 | 593 | ||
593 | pango_printf(cairo, config->font, output->sway_output->wlr_output->scale, | 594 | pango_printf(cairo, config->font, output->sway_output->wlr_output->scale, |