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/sway | |
parent | Fix gaps in title textures and vertically center them (diff) | |
download | sway-9215ca0f01f7d155191d11fd9caa2574387c6f84.tar.gz sway-9215ca0f01f7d155191d11fd9caa2574387c6f84.tar.zst sway-9215ca0f01f7d155191d11fd9caa2574387c6f84.zip |
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/sway')
-rw-r--r-- | include/sway/config.h | 1 | ||||
-rw-r--r-- | include/sway/tree/container.h | 1 |
2 files changed, 2 insertions, 0 deletions
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 { | |||
349 | enum sway_container_layout default_layout; | 349 | enum sway_container_layout default_layout; |
350 | char *font; | 350 | char *font; |
351 | size_t font_height; | 351 | size_t font_height; |
352 | size_t font_baseline; | ||
352 | bool pango_markup; | 353 | bool pango_markup; |
353 | size_t urgent_timeout; | 354 | size_t urgent_timeout; |
354 | enum sway_fowa focus_on_window_activation; | 355 | 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 { | |||
117 | struct wlr_texture *title_unfocused; | 117 | struct wlr_texture *title_unfocused; |
118 | struct wlr_texture *title_urgent; | 118 | struct wlr_texture *title_urgent; |
119 | size_t title_height; | 119 | size_t title_height; |
120 | size_t title_baseline; | ||
120 | 121 | ||
121 | struct { | 122 | struct { |
122 | struct wl_signal destroy; | 123 | struct wl_signal destroy; |