From 80e8be71a34c44dec693c0b54f8b6b220920b290 Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Sun, 21 Oct 2018 22:57:29 -0400 Subject: [PATCH] cmd_reload: recalc font sizing + rebuild textures When the config gets reloaded, the font height and baseline get reset to 0. If the config does not have a font command in it, the variables will remain at 0 causing a transparent area where the title would be rendered. This makes it so the font height and baseline are recalculated. Additionally, since the font height and baseline may have changed due to the reload, the title and marks textures are rebuilt. --- sway/commands/reload.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sway/commands/reload.c b/sway/commands/reload.c index 9e136d483..791081a84 100644 --- a/sway/commands/reload.c +++ b/sway/commands/reload.c @@ -5,9 +5,17 @@ #include "sway/ipc-server.h" #include "sway/server.h" #include "sway/tree/arrange.h" +#include "sway/tree/view.h" #include "list.h" #include "log.h" +static void rebuild_textures_iterator(struct sway_container *con, void *data) { + if (con->view) { + view_update_marks_textures(con->view); + } + container_update_title_textures(con); +} + static void do_reload(void *data) { // store bar ids to check against new bars for barconfig_update events list_t *bar_ids = create_list(); @@ -40,6 +48,9 @@ static void do_reload(void *data) { list_foreach(bar_ids, free); list_free(bar_ids); + config_update_font_height(true); + root_for_each_container(rebuild_textures_iterator, NULL); + arrange_root(); }