aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <RyanDwyer@users.noreply.github.com>2018-10-22 22:40:26 +1000
committerLibravatar GitHub <noreply@github.com>2018-10-22 22:40:26 +1000
commitdb2b54555096c38c5634372d70cf733b5b60a35d (patch)
tree8696d1c2d30824b01e775c7f118a58eb92ec3ebb
parentMerge pull request #2913 from emersion/fix-swaybar-hotplug (diff)
parentcmd_reload: recalc font sizing + rebuild textures (diff)
downloadsway-db2b54555096c38c5634372d70cf733b5b60a35d.tar.gz
sway-db2b54555096c38c5634372d70cf733b5b60a35d.tar.zst
sway-db2b54555096c38c5634372d70cf733b5b60a35d.zip
Merge pull request #2922 from RedSoxFan/fix-2905
cmd_reload: recalc font sizing + rebuild textures
-rw-r--r--sway/commands/reload.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/sway/commands/reload.c b/sway/commands/reload.c
index 9e136d48..791081a8 100644
--- a/sway/commands/reload.c
+++ b/sway/commands/reload.c
@@ -5,9 +5,17 @@
5#include "sway/ipc-server.h" 5#include "sway/ipc-server.h"
6#include "sway/server.h" 6#include "sway/server.h"
7#include "sway/tree/arrange.h" 7#include "sway/tree/arrange.h"
8#include "sway/tree/view.h"
8#include "list.h" 9#include "list.h"
9#include "log.h" 10#include "log.h"
10 11
12static void rebuild_textures_iterator(struct sway_container *con, void *data) {
13 if (con->view) {
14 view_update_marks_textures(con->view);
15 }
16 container_update_title_textures(con);
17}
18
11static void do_reload(void *data) { 19static void do_reload(void *data) {
12 // store bar ids to check against new bars for barconfig_update events 20 // store bar ids to check against new bars for barconfig_update events
13 list_t *bar_ids = create_list(); 21 list_t *bar_ids = create_list();
@@ -40,6 +48,9 @@ static void do_reload(void *data) {
40 list_foreach(bar_ids, free); 48 list_foreach(bar_ids, free);
41 list_free(bar_ids); 49 list_free(bar_ids);
42 50
51 config_update_font_height(true);
52 root_for_each_container(rebuild_textures_iterator, NULL);
53
43 arrange_root(); 54 arrange_root();
44} 55}
45 56