aboutsummaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorLibravatar Hugo Osvaldo Barrera <hugo@barrera.io>2021-09-17 17:32:29 +0200
committerLibravatar Simon Ser <contact@emersion.fr>2021-09-20 09:25:47 +0200
commitc16b2a26ed2c2f718cb8a2084fa93636fabed95f (patch)
tree2a0ea215552cf497f2f6b4f25552975eb33781b0 /common
parentsway-ipc.7.scd: fix typo (diff)
downloadsway-c16b2a26ed2c2f718cb8a2084fa93636fabed95f.tar.gz
sway-c16b2a26ed2c2f718cb8a2084fa93636fabed95f.tar.zst
sway-c16b2a26ed2c2f718cb8a2084fa93636fabed95f.zip
Avoid unecessary font metric calculations
Prior to 62d90a8e, titlebar's font height (and other related values) would change any time any titlebar's content changed, so these values were recalculated each time any titlebar's content changed (or a new titlebar was created). However, since the above was merge, these values no longer change so often and we only need to recalculate them when the configured font changes (and stop calling `config_update_font_height` each time titlebars are rendered). This commit removes all the unecessary calls to this function and avoids all those unecessary calculations. Whenever the font strays from the default value, the `font` command is called, and it calls `config_update_font_height`, which is enough to keep the value always up to date. I've also added a default value to the `font_baseline` config, since otherwise that's zero for setups that don't explicitly specify a font.
Diffstat (limited to 'common')
-rw-r--r--common/pango.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/common/pango.c b/common/pango.c
index 89b1ac41..abc18281 100644
--- a/common/pango.c
+++ b/common/pango.c
@@ -113,10 +113,8 @@ void get_text_metrics(const char *font, int *height, int *baseline) {
113 cairo_t *cairo = cairo_create(NULL); 113 cairo_t *cairo = cairo_create(NULL);
114 PangoContext *pango = pango_cairo_create_context(cairo); 114 PangoContext *pango = pango_cairo_create_context(cairo);
115 PangoFontDescription *description = pango_font_description_from_string(font); 115 PangoFontDescription *description = pango_font_description_from_string(font);
116 PangoFontMetrics *metrics;
117
118 // When passing NULL as a language, pango uses the current locale. 116 // When passing NULL as a language, pango uses the current locale.
119 metrics = pango_context_get_metrics(pango, description, NULL); 117 PangoFontMetrics *metrics = pango_context_get_metrics(pango, description, NULL);
120 118
121 *baseline = pango_font_metrics_get_ascent(metrics) / PANGO_SCALE; 119 *baseline = pango_font_metrics_get_ascent(metrics) / PANGO_SCALE;
122 *height = *baseline + pango_font_metrics_get_descent(metrics) / PANGO_SCALE; 120 *height = *baseline + pango_font_metrics_get_descent(metrics) / PANGO_SCALE;