container: fix surface_is_popup()

1 files changed, 9 insertions, 11 deletions

diff --git a/sway/tree/container.c b/sway/tree/container.c
index 6a01eab3..943d3d53 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -382,19 +382,17 @@ struct sway_container *tiling_container_at(struct sway_node *parent,
 }
 
 static bool surface_is_popup(struct wlr_surface *surface) {
-        if (wlr_surface_is_xdg_surface(surface)) {
-                struct wlr_xdg_surface *xdg_surface =
-                        wlr_xdg_surface_from_wlr_surface(surface);
-                while (xdg_surface && xdg_surface->role != WLR_XDG_SURFACE_ROLE_NONE) {
-                        if (xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP) {
-                                return true;
-                        }
-                        xdg_surface = xdg_surface->toplevel->parent;
+        while (!wlr_surface_is_xdg_surface(surface)) {
+                if (!wlr_surface_is_subsurface(surface)) {
+                        return false;
                 }
-                return false;
+                struct wlr_subsurface *subsurface =
+                        wlr_subsurface_from_wlr_surface(surface);
+                surface = subsurface->parent;
         }
-
-        return false;
+        struct wlr_xdg_surface *xdg_surface =
+                wlr_xdg_surface_from_wlr_surface(surface);
+        return xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP;
 }
 
 struct sway_container *container_at(struct sway_workspace *workspace,