diff options
| author | Ian Huang <imyxh@protonmail.com> | 2020-04-19 17:56:11 -0700 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2020-04-20 09:26:37 +0200 |
| commit | 276e0301e0d68cc799a7073d26a7a10c11d036ff (patch) | |
| tree | 9c14a3c5a87e2d89fb9b5949760ecf3d1f4b29a2 | |
| parent | 2b15cf453e4b28324e9012515011a705c2960b30 (diff) | |
interpret "subpixel none" as CAIRO_ANTIALIAS_GRAY
See issue #5228. Currently, WL_OUTPUT_SUBPIXEL_NONE is ignored and
CAIRO_ANTIALIAS_SUBPIXEL is still set. This commit checks if subpixel is
set to none and if so, calls set_antialias with CAIRO_ANTIALIAS_GRAY.
This mirrors the functionality in Mako's
[PR261](https://github.com/emersion/mako/pull/261)
| -rw-r--r-- | sway/tree/container.c | 9 | ||||
| -rw-r--r-- | swaybar/render.c | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index 0c40af0a..d6c9a945 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -459,8 +459,13 @@ static void update_title_texture(struct sway_container *con, cairo_set_antialias(c, CAIRO_ANTIALIAS_BEST); cairo_font_options_t *fo = cairo_font_options_create(); cairo_font_options_set_hint_style(fo, CAIRO_HINT_STYLE_FULL); - cairo_font_options_set_antialias(fo, CAIRO_ANTIALIAS_SUBPIXEL); - cairo_font_options_set_subpixel_order(fo, to_cairo_subpixel_order(output->wlr_output->subpixel)); + if (output->wlr_output->subpixel == WL_OUTPUT_SUBPIXEL_NONE) { + cairo_font_options_set_antialias(fo, CAIRO_ANTIALIAS_GRAY); + } else { + cairo_font_options_set_antialias(fo, CAIRO_ANTIALIAS_SUBPIXEL); + cairo_font_options_set_subpixel_order(fo, + to_cairo_subpixel_order(output->wlr_output->subpixel)); + } cairo_set_font_options(c, fo); get_text_size(c, config->font, &width, NULL, NULL, scale, config->pango_markup, "%s", con->formatted_title); diff --git a/swaybar/render.c b/swaybar/render.c index ea5faef6..3a626e1c 100644 --- a/swaybar/render.c +++ b/swaybar/render.c @@ -698,8 +698,13 @@ void render_frame(struct swaybar_output *output) { cairo_set_antialias(cairo, CAIRO_ANTIALIAS_BEST); cairo_font_options_t *fo = cairo_font_options_create(); cairo_font_options_set_hint_style(fo, CAIRO_HINT_STYLE_FULL); - cairo_font_options_set_antialias(fo, CAIRO_ANTIALIAS_SUBPIXEL); - cairo_font_options_set_subpixel_order(fo, to_cairo_subpixel_order(output->subpixel)); + if (output->subpixel == WL_OUTPUT_SUBPIXEL_NONE) { + cairo_font_options_set_antialias(fo, CAIRO_ANTIALIAS_GRAY); + } else { + cairo_font_options_set_antialias(fo, CAIRO_ANTIALIAS_SUBPIXEL); + cairo_font_options_set_subpixel_order(fo, + to_cairo_subpixel_order(output->subpixel)); + } cairo_set_font_options(cairo, fo); cairo_font_options_destroy(fo); cairo_save(cairo); |