summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar D.B <thejan.2009@gmail.com>2016-07-28 09:26:38 +0200
committerLibravatar D.B <thejan.2009@gmail.com>2016-07-28 10:31:18 +0200
commit33c1df38bdb77ea8888fcfa7cd3068d9d642187d (patch)
tree1e118724c51c1e4c304258b008b6c69f3c3e64de
parentMerge pull request #790 from acrisci/bug/switch-focus-workspace-output (diff)
downloadsway-33c1df38bdb77ea8888fcfa7cd3068d9d642187d.tar.gz
sway-33c1df38bdb77ea8888fcfa7cd3068d9d642187d.tar.zst
sway-33c1df38bdb77ea8888fcfa7cd3068d9d642187d.zip
Close all focused container's child views on kill
Previously, cmd_kill only closed a focused view, while containers were not affected. Now it closes all views that are children of the focused container.
-rw-r--r--sway/commands.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/commands.c b/sway/commands.c
index ed561764..c78c2660 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -1925,8 +1925,8 @@ static struct cmd_results *cmd_kill(int argc, char **argv) {
1925 if (config->reading) return cmd_results_new(CMD_FAILURE, "kill", "Can't be used in config file."); 1925 if (config->reading) return cmd_results_new(CMD_FAILURE, "kill", "Can't be used in config file.");
1926 if (!config->active) return cmd_results_new(CMD_FAILURE, "kill", "Can only be used when sway is running."); 1926 if (!config->active) return cmd_results_new(CMD_FAILURE, "kill", "Can only be used when sway is running.");
1927 1927
1928 swayc_t *view = get_focused_container(&root_container); 1928 swayc_t *container = get_focused_container(&root_container);
1929 wlc_view_close(view->handle); 1929 close_views(container);
1930 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 1930 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
1931} 1931}
1932 1932