From a3451805200cd63ffe7478288a6d9b410cdaee35 Mon Sep 17 00:00:00 2001 From: Hugo Osvaldo Barrera Date: Sun, 19 Sep 2021 21:02:59 +0200 Subject: Drop hardcoded font metric values --- sway/config.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sway/config.c b/sway/config.c index 6d0f465a..e3daacda 100644 --- a/sway/config.c +++ b/sway/config.c @@ -236,8 +236,6 @@ static void config_defaults(struct sway_config *config) { config->default_layout = L_NONE; config->default_orientation = L_NONE; if (!(config->font = strdup("monospace 10"))) goto cleanup; - config->font_height = 17; // height of monospace 10 - config->font_baseline = 11; // baselint of monospace 10 config->urgent_timeout = 500; config->focus_on_window_activation = FOWA_URGENT; config->popup_during_fullscreen = POPUP_SMART; @@ -542,6 +540,9 @@ bool load_main_config(const char *file, bool is_active, bool validating) { return success; } + // Only really necessary if not explicitly `font` is set in the config. + config_update_font_height(); + if (is_active && !validating) { input_manager_verify_fallback_seat(); -- cgit v1.2.3-70-g09d2