diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-05-05 18:25:31 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-05-05 22:29:37 +1000 |
commit | 5d6d24e71aabc026c99ac736c788fa8103658c42 (patch) | |
tree | fe0fd2a72ceeb282a335692ebd53f618c476ab21 /sway/commands | |
parent | Refactor parse_title_format() (diff) | |
download | sway-5d6d24e71aabc026c99ac736c788fa8103658c42.tar.gz sway-5d6d24e71aabc026c99ac736c788fa8103658c42.tar.zst sway-5d6d24e71aabc026c99ac736c788fa8103658c42.zip |
Move code for re-arranging after font height change into a common place
Diffstat (limited to 'sway/commands')
-rw-r--r-- | sway/commands/font.c | 6 | ||||
-rw-r--r-- | sway/commands/title_format.c | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/sway/commands/font.c b/sway/commands/font.c index 38ad8880..8e0b51e3 100644 --- a/sway/commands/font.c +++ b/sway/commands/font.c | |||
@@ -2,7 +2,6 @@ | |||
2 | #include <string.h> | 2 | #include <string.h> |
3 | #include "sway/commands.h" | 3 | #include "sway/commands.h" |
4 | #include "sway/config.h" | 4 | #include "sway/config.h" |
5 | #include "sway/tree/arrange.h" | ||
6 | #include "log.h" | 5 | #include "log.h" |
7 | #include "stringop.h" | 6 | #include "stringop.h" |
8 | 7 | ||
@@ -14,9 +13,6 @@ struct cmd_results *cmd_font(int argc, char **argv) { | |||
14 | char *font = join_args(argv, argc); | 13 | char *font = join_args(argv, argc); |
15 | free(config->font); | 14 | free(config->font); |
16 | config->font = strdup(font); | 15 | config->font = strdup(font); |
17 | config_find_font_height(true); | 16 | config_update_font_height(true); |
18 | if (!config->reading) { | ||
19 | arrange_root(); | ||
20 | } | ||
21 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 17 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
22 | } | 18 | } |
diff --git a/sway/commands/title_format.c b/sway/commands/title_format.c index 26ddb2f4..3d1c578c 100644 --- a/sway/commands/title_format.c +++ b/sway/commands/title_format.c | |||
@@ -2,7 +2,6 @@ | |||
2 | #include <string.h> | 2 | #include <string.h> |
3 | #include "sway/commands.h" | 3 | #include "sway/commands.h" |
4 | #include "sway/config.h" | 4 | #include "sway/config.h" |
5 | #include "sway/tree/arrange.h" | ||
6 | #include "sway/tree/view.h" | 5 | #include "sway/tree/view.h" |
7 | #include "log.h" | 6 | #include "log.h" |
8 | #include "stringop.h" | 7 | #include "stringop.h" |
@@ -25,7 +24,6 @@ struct cmd_results *cmd_title_format(int argc, char **argv) { | |||
25 | } | 24 | } |
26 | view->title_format = format; | 25 | view->title_format = format; |
27 | view_update_title(view, true); | 26 | view_update_title(view, true); |
28 | config_find_font_height(true); | 27 | config_update_font_height(true); |
29 | arrange_root(); | ||
30 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 28 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
31 | } | 29 | } |