sway

commit 71a37ad186ba3080338b2ecb5a3e640600aefc1f
parent 8ce57f0a77f50315c83bae305e78091cc40175c2
Author: Drew DeVault <sir@cmpwn.com>
Date:   Tue, 22 Jan 2019 07:55:31 -0500

Merge pull request #3494 from ianyfan/commands

i3 command behaviour compatibility fixes
Diffstat:
M
sway/commands/floating.c
 | 
7
+------
M
sway/commands/sticky.c
 | 
7
+------
M
sway/tree/container.c
 | 
1
-

3 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/sway/commands/floating.c b/sway/commands/floating.c
@@ -40,12 +40,7 @@ struct cmd_results *cmd_floating(int argc, char **argv) {
 		}
 	}
 
-	if (container->scratchpad && !container->workspace) {
-		return cmd_results_new(CMD_FAILURE,
-				"Cannot set floating status on a hidden scratchpad container");
-	}
-
-	bool wants_floating = 
+	bool wants_floating =
 		parse_boolean(argv[0], container_is_floating(container));
 
 	container_set_floating(container, wants_floating);
diff --git a/sway/commands/sticky.c b/sway/commands/sticky.c
@@ -22,14 +22,9 @@ struct cmd_results *cmd_sticky(int argc, char **argv) {
 		return cmd_results_new(CMD_FAILURE, "No current container");
 	};
 	
-	if (!container_is_floating(container)) {
-		return cmd_results_new(CMD_FAILURE,
-			"Can't set sticky on a tiled container");
-	}
-
 	container->is_sticky = parse_boolean(argv[0], container->is_sticky);
 
-	if (container->is_sticky &&
+	if (container->is_sticky && container_is_floating_or_child(container) &&
 			(!container->scratchpad || container->workspace)) {
 		// move container to active workspace
 		struct sway_workspace *active_workspace =
diff --git a/sway/tree/container.c b/sway/tree/container.c
@@ -708,7 +708,6 @@ void container_set_floating(struct sway_container *container, bool enable) {
 				container->border = container->saved_border;
 			}
 		}
-		container->is_sticky = false;
 	}
 
 	container_end_mouse_operation(container);