Operate on floating split container when a child is focused

3 files changed, 27 insertions, 2 deletions

diff --git a/sway/commands/floating.c b/sway/commands/floating.c
index b67e736f..31de5ec3 100644
--- a/sway/commands/floating.c
+++ b/sway/commands/floating.c
@@ -29,6 +29,14 @@ struct cmd_results *cmd_floating(int argc, char **argv) {
 		seat_set_focus(config->handler_context.seat, container);
 	}
 
+	// If the container is in a floating split container,
+	// operate on the split container instead of the child.
+	if (container_is_floating_or_child(container)) {
+		while (container->parent->layout != L_FLOATING) {
+			container = container->parent;
+		}
+	}
+
 	bool wants_floating;
 	if (strcasecmp(argv[0], "enable") == 0) {
 		wants_floating = true;
diff --git a/sway/commands/scratchpad.c b/sway/commands/scratchpad.c
index ccc07c87..01a91d65 100644
--- a/sway/commands/scratchpad.c
+++ b/sway/commands/scratchpad.c
@@ -19,11 +19,19 @@ struct cmd_results *cmd_scratchpad(int argc, char **argv) {
 	}
 
 	if (config->handler_context.using_criteria) {
+		struct sway_container *con = config->handler_context.current_container;
+
+		// If the container is in a floating split container,
+		// operate on the split container instead of the child.
+		if (container_is_floating_or_child(con)) {
+			while (con->parent->layout != L_FLOATING) {
+				con = con->parent;
+			}
+		}
+
 		// If using criteria, this command is executed for every container which
 		// matches the criteria. If this container isn't in the scratchpad,
 		// we'll just silently return a success.
-		struct sway_container *con = config->handler_context.current_container;
-		wlr_log(WLR_INFO, "cmd_scratchpad(%s)", con->name);
 		if (!con->scratchpad) {
 			return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 		}
diff --git a/sway/scratchpad.c b/sway/scratchpad.c
index 181d9b3b..787af6e1 100644
--- a/sway/scratchpad.c
+++ b/sway/scratchpad.c
@@ -110,6 +110,15 @@ void scratchpad_toggle_auto(void) {
 	struct sway_container *ws = focus->type == C_WORKSPACE ?
 		focus : container_parent(focus, C_WORKSPACE);
 
+	// If the focus is in a floating split container,
+	// operate on the split container instead of the child.
+	if (container_is_floating_or_child(focus)) {
+		while (focus->parent->layout != L_FLOATING) {
+			focus = focus->parent;
+		}
+	}
+
+
     // Check if the currently focused window is a scratchpad window and should
     // be hidden again.
 	if (focus->scratchpad) {