diff options
-rw-r--r-- | sway/commands/move.c | 2 | ||||
-rw-r--r-- | sway/commands/reload.c | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/sway/commands/move.c b/sway/commands/move.c index a5b7f661..e0a958bf 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c | |||
@@ -108,7 +108,7 @@ static void workspace_focus_fullscreen(struct sway_workspace *workspace) { | |||
108 | if (focus_ws == workspace) { | 108 | if (focus_ws == workspace) { |
109 | struct sway_node *new_focus = | 109 | struct sway_node *new_focus = |
110 | seat_get_focus_inactive(seat, &workspace->fullscreen->node); | 110 | seat_get_focus_inactive(seat, &workspace->fullscreen->node); |
111 | seat_set_focus(seat, new_focus); | 111 | seat_set_raw_focus(seat, new_focus); |
112 | } | 112 | } |
113 | } | 113 | } |
114 | } | 114 | } |
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 | ||
12 | static 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 | |||
11 | static void do_reload(void *data) { | 19 | static 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 | ||