diff options
| -rw-r--r-- | dwl.c | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -967,18 +967,17 @@ createnotify(struct wl_listener *listener, void *data) if (xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP) { struct wlr_box box; - LayerSurface *l; - void *toplevel = toplevel_from_popup(xdg_surface->popup); + LayerSurface *l = toplevel_from_popup(xdg_surface->popup); xdg_surface->surface->data = wlr_scene_xdg_surface_create( xdg_surface->popup->parent->data, xdg_surface); - if (wlr_surface_is_layer_surface(xdg_surface->popup->parent) && (l = toplevel) + if (wlr_surface_is_layer_surface(xdg_surface->popup->parent) && l && l->layer_surface->current.layer < ZWLR_LAYER_SHELL_V1_LAYER_TOP) wlr_scene_node_reparent(xdg_surface->surface->data, layers[LyrTop]); - if (!(c = toplevel) || !c->mon) + if (!l || !l->mon) return; - box = c->type == LayerShell ? c->mon->m : c->mon->w; - box.x -= c->geom.x; - box.y -= c->geom.y; + box = l->type == LayerShell ? l->mon->m : l->mon->w; + box.x -= l->geom.x; + box.y -= l->geom.y; wlr_xdg_popup_unconstrain_from_box(xdg_surface->popup, &box); return; } else if (xdg_surface->role == WLR_XDG_SURFACE_ROLE_NONE) |