Merge pull request #2922 from RedSoxFan/fix-2905

cmd_reload: recalc font sizing + rebuild textures
This commit is contained in:
Ryan Dwyer 2018-10-22 22:40:26 +10:00 committed by GitHub
commit db2b545550
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -5,9 +5,17 @@
#include "sway/ipc-server.h" #include "sway/ipc-server.h"
#include "sway/server.h" #include "sway/server.h"
#include "sway/tree/arrange.h" #include "sway/tree/arrange.h"
#include "sway/tree/view.h"
#include "list.h" #include "list.h"
#include "log.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) { static void do_reload(void *data) {
// store bar ids to check against new bars for barconfig_update events // store bar ids to check against new bars for barconfig_update events
list_t *bar_ids = create_list(); list_t *bar_ids = create_list();
@ -40,6 +48,9 @@ static void do_reload(void *data) {
list_foreach(bar_ids, free); list_foreach(bar_ids, free);
list_free(bar_ids); list_free(bar_ids);
config_update_font_height(true);
root_for_each_container(rebuild_textures_iterator, NULL);
arrange_root(); arrange_root();
} }