mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-10 20:44:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Drop hardcoded font metric values

Browse Source
This commit is contained in:
Hugo Osvaldo Barrera 2021-09-19 21:02:59 +02:00 committed by Simon Ser
parent c16b2a26ed
commit a345180520
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sway/config.c
View File

@ -236,8 +236,6 @@ static void config_defaults(struct sway_config *config) {
config->default_layout = L_NONE; config->default_layout = L_NONE;
config->default_orientation = L_NONE; config->default_orientation = L_NONE;
if (!(config->font = strdup("monospace 10"))) goto cleanup; 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->urgent_timeout = 500;
config->focus_on_window_activation = FOWA_URGENT; config->focus_on_window_activation = FOWA_URGENT;
config->popup_during_fullscreen = POPUP_SMART; config->popup_during_fullscreen = POPUP_SMART;
@ -542,6 +540,9 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
return success; return success;
} }
// Only really necessary if not explicitly `font` is set in the config.
config_update_font_height();
if (is_active && !validating) { if (is_active && !validating) {
input_manager_verify_fallback_seat(); input_manager_verify_fallback_seat();