diff options
| author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-09-08 16:19:31 +1000 |
|---|---|---|
| committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-09-08 16:25:07 +1000 |
| commit | 9215ca0f01f7d155191d11fd9caa2574387c6f84 (patch) | |
| tree | a1defcadae4b1d07388fd9e6bfe2a09051aec777 /include | |
| parent | 9226aad58cca4dd5a408f46c4ae27f339e415b7d (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 'include')
| -rw-r--r-- | include/pango.h | 2 | ||||
| -rw-r--r-- | include/sway/config.h | 1 | ||||
| -rw-r--r-- | include/sway/tree/container.h | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/include/pango.h b/include/pango.h index 4492f01e..09a535a5 100644 --- a/include/pango.h +++ b/include/pango.h @@ -20,7 +20,7 @@ int escape_markup_text(const char *src, char *dest, int dest_length); PangoLayout *get_pango_layout(cairo_t *cairo, const char *font, const char *text, double scale, bool markup); 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, ...); void pango_printf(cairo_t *cairo, const char *font, double scale, bool markup, const char *fmt, ...); diff --git a/include/sway/config.h b/include/sway/config.h index 2fef0081..b52bb681 100644 --- a/include/sway/config.h +++ b/include/sway/config.h @@ -349,6 +349,7 @@ struct sway_config { enum sway_container_layout default_layout; char *font; size_t font_height; + size_t font_baseline; bool pango_markup; size_t urgent_timeout; enum sway_fowa focus_on_window_activation; diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index 6efecf7c..2735daa3 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h @@ -117,6 +117,7 @@ struct sway_container { struct wlr_texture *title_unfocused; struct wlr_texture *title_urgent; size_t title_height; + size_t title_baseline; struct { struct wl_signal destroy; |