5 files changed, 8 insertions, 9 deletions

diff --git a/sway/commands/floating.c b/sway/commands/floating.c
index c9467ef0..beafd9fb 100644
--- a/sway/commands/floating.c
+++ b/sway/commands/floating.c
@@ -33,7 +33,7 @@ struct cmd_results *cmd_floating(int argc, char **argv) {
         // 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) {
+                while (container->parent->type != C_WORKSPACE) {
                         container = container->parent;
                 }
         }
diff --git a/sway/commands/focus.c b/sway/commands/focus.c
index fe15b4c7..6659a683 100644
--- a/sway/commands/focus.c
+++ b/sway/commands/focus.c
@@ -39,7 +39,7 @@ static struct cmd_results *focus_mode(struct sway_container *con,
         // 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) {
+                while (con->parent->type != C_WORKSPACE) {
                         con = con->parent;
                 }
         }
diff --git a/sway/commands/move.c b/sway/commands/move.c
index 33d1ee4a..e788d32f 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -449,7 +449,7 @@ static struct cmd_results *move_to_scratchpad(struct sway_container *con) {
         // 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) {
+                while (con->parent->type != C_WORKSPACE) {
                         con = con->parent;
                 }
         }
diff --git a/sway/commands/scratchpad.c b/sway/commands/scratchpad.c
index 0e573aeb..7da20015 100644
--- a/sway/commands/scratchpad.c
+++ b/sway/commands/scratchpad.c
@@ -16,7 +16,7 @@ static void scratchpad_toggle_auto(void) {
         // 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) {
+                while (focus->parent->type != C_WORKSPACE) {
                         focus = focus->parent;
                 }
         }
@@ -33,9 +33,8 @@ static void scratchpad_toggle_auto(void) {
 
         // Check if there is an unfocused scratchpad window on the current workspace
         // and focus it.
-        for (int i = 0; i < ws->sway_workspace->floating->children->length; ++i) {
-                struct sway_container *floater =
-                        ws->sway_workspace->floating->children->items[i];
+        for (int i = 0; i < ws->sway_workspace->floating->length; ++i) {
+                struct sway_container *floater = ws->sway_workspace->floating->items[i];
                 if (floater->scratchpad && focus != floater) {
                         wlr_log(WLR_DEBUG,
                                         "Focusing other scratchpad window (%s) in this workspace",
@@ -103,7 +102,7 @@ struct cmd_results *cmd_scratchpad(int argc, char **argv) {
                 // 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) {
+                        while (con->parent->type != C_WORKSPACE) {
                                 con = con->parent;
                         }
                 }
diff --git a/sway/commands/swap.c b/sway/commands/swap.c
index 615e6b1d..f881a002 100644
--- a/sway/commands/swap.c
+++ b/sway/commands/swap.c
@@ -72,7 +72,7 @@ struct cmd_results *cmd_swap(int argc, char **argv) {
                         || container_has_ancestor(other, current)) {
                 error = cmd_results_new(CMD_FAILURE, "swap",
                                 "Cannot swap ancestor and descendant");
-        } else if (current->layout == L_FLOATING || other->layout == L_FLOATING) {
+        } else if (container_is_floating(current) || container_is_floating(other)) {
                 error = cmd_results_new(CMD_FAILURE, "swap",
                                 "Swapping with floating containers is not supported");
         }