aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands/unmark.c
diff options
context:
space:
mode:
Diffstat (limited to 'sway/commands/unmark.c')
-rw-r--r--sway/commands/unmark.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/sway/commands/unmark.c b/sway/commands/unmark.c
index cedfcfb2..c3a6ac4b 100644
--- a/sway/commands/unmark.c
+++ b/sway/commands/unmark.c
@@ -8,9 +8,13 @@
8#include "log.h" 8#include "log.h"
9#include "stringop.h" 9#include "stringop.h"
10 10
11static void remove_all_marks_iterator(struct sway_container *con, void *data) { 11static void remove_mark(struct sway_container *con) {
12 container_clear_marks(con); 12 container_clear_marks(con);
13 container_update_marks_textures(con); 13 container_update_marks(con);
14}
15
16static void remove_all_marks_iterator(struct sway_container *con, void *data) {
17 remove_mark(con);
14} 18}
15 19
16// unmark Remove all marks from all views 20// unmark Remove all marks from all views
@@ -21,7 +25,7 @@ static void remove_all_marks_iterator(struct sway_container *con, void *data) {
21struct cmd_results *cmd_unmark(int argc, char **argv) { 25struct cmd_results *cmd_unmark(int argc, char **argv) {
22 // Determine the container 26 // Determine the container
23 struct sway_container *con = NULL; 27 struct sway_container *con = NULL;
24 if (config->handler_context.using_criteria) { 28 if (config->handler_context.node_overridden) {
25 con = config->handler_context.container; 29 con = config->handler_context.container;
26 } 30 }
27 31
@@ -38,8 +42,7 @@ struct cmd_results *cmd_unmark(int argc, char **argv) {
38 } 42 }
39 } else if (con && !mark) { 43 } else if (con && !mark) {
40 // Clear all marks from the given container 44 // Clear all marks from the given container
41 container_clear_marks(con); 45 remove_mark(con);
42 container_update_marks_textures(con);
43 } else if (!con && mark) { 46 } else if (!con && mark) {
44 // Remove mark from whichever container has it 47 // Remove mark from whichever container has it
45 container_find_and_unmark(mark); 48 container_find_and_unmark(mark);