summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--client.h7
-rw-r--r--dwl.c3
2 files changed, 6 insertions, 4 deletions
diff --git a/client.h b/client.h
index 0753da8..8a379d0 100644
--- a/client.h
+++ b/client.h
@@ -172,8 +172,11 @@ client_get_parent(Client *c)
{
Client *p = NULL;
#ifdef XWAYLAND
- if (client_is_x11(c) && c->surface.xwayland->parent)
- toplevel_from_wlr_surface(c->surface.xwayland->parent->surface, &p, NULL);
+ if (client_is_x11(c)) {
+ if (c->surface.xwayland->parent)
+ toplevel_from_wlr_surface(c->surface.xwayland->parent->surface, &p, NULL);
+ return p;
+ }
#endif
if (c->surface.xdg->toplevel->parent)
toplevel_from_wlr_surface(c->surface.xdg->toplevel->parent->base->surface, &p, NULL);
diff --git a/dwl.c b/dwl.c
index f407477..b04b66a 100644
--- a/dwl.c
+++ b/dwl.c
@@ -1542,8 +1542,7 @@ mapnotify(struct wl_listener *listener, void *data)
* we always consider floating, clients that have parent and thus
* we set the same tags and monitor than its parent, if not
* try to apply rules for them */
- /* TODO: https://github.com/djpohly/dwl/pull/334#issuecomment-1330166324 */
- if (c->type == XDGShell && (p = client_get_parent(c))) {
+ if ((p = client_get_parent(c))) {
c->isfloating = 1;
setmon(c, p->mon, p->tags);
} else {