aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-09-08 16:19:31 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-09-08 16:25:07 +1000
commit9215ca0f01f7d155191d11fd9caa2574387c6f84 (patch)
treea1defcadae4b1d07388fd9e6bfe2a09051aec777 /common
parent9226aad58cca4dd5a408f46c4ae27f339e415b7d (diff)
Align titles to baseline
This does the following: * Adds a baseline argument to get_text_size (the baseline is the distance from the top of the texture to the baseline). * Stores the baseline in the container when calculating the title height. * Takes the baseline into account when calculating the config's max font height. * When rendering, pads the textures according to the baseline so they line up.
Diffstat (limited to 'common')
-rw-r--r--common/pango.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/common/pango.c b/common/pango.c
index 92703f80..ea71ac4a 100644
--- a/common/pango.c
+++ b/common/pango.c
@@ -103,7 +103,7 @@ PangoLayout *get_pango_layout(cairo_t *cairo, const char *font,
}
void get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
- double scale, bool markup, const char *fmt, ...) {
+ int *baseline, double scale, bool markup, const char *fmt, ...) {
static char buf[2048];
va_list args;
@@ -116,6 +116,9 @@ void get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
PangoLayout *layout = get_pango_layout(cairo, font, buf, scale, markup);
pango_cairo_update_layout(cairo, layout);
pango_layout_get_pixel_size(layout, width, height);
+ if (baseline) {
+ *baseline = pango_layout_get_baseline(layout) / PANGO_SCALE;
+ }
g_object_unref(layout);
}