diff options
| author | 0undefined <oscar@nelin.dk> | 2025-02-15 08:06:25 +0000 |
|---|---|---|
| committer | 0undefined <oscar@nelin.dk> | 2025-02-15 08:06:25 +0000 |
| commit | 37e30a171ce29d4086b8472ef45d9403828252aa (patch) | |
| tree | 1ce1a4ad0ab474b4050eb256aaf0c30a3d0a562a /client.h | |
| parent | 9c2a7d001dc4cf205b79aeb2d1196e26977111fc (diff) | |
| parent | aa69ed81b558f74e470e69cdcd442f9048ee624c (diff) | |
Merge remote-tracking branch 'upstream/main' into tmp
Diffstat (limited to 'client.h')
| -rw-r--r-- | client.h | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -225,16 +225,15 @@ client_is_float_type(Client *c) if (client_is_x11(c)) { struct wlr_xwayland_surface *surface = c->surface.xwayland; xcb_size_hints_t *size_hints = surface->size_hints; - size_t i; if (surface->modal) return 1; - for (i = 0; i < surface->window_type_len; i++) - if (surface->window_type[i] == netatom[NetWMWindowTypeDialog] - || surface->window_type[i] == netatom[NetWMWindowTypeSplash] - || surface->window_type[i] == netatom[NetWMWindowTypeToolbar] - || surface->window_type[i] == netatom[NetWMWindowTypeUtility]) - return 1; + if (wlr_xwayland_surface_has_window_type(surface, WLR_XWAYLAND_NET_WM_WINDOW_TYPE_DIALOG) + || wlr_xwayland_surface_has_window_type(surface, WLR_XWAYLAND_NET_WM_WINDOW_TYPE_SPLASH) + || wlr_xwayland_surface_has_window_type(surface, WLR_XWAYLAND_NET_WM_WINDOW_TYPE_TOOLBAR) + || wlr_xwayland_surface_has_window_type(surface, WLR_XWAYLAND_NET_WM_WINDOW_TYPE_UTILITY)) { + return 1; + } return size_hints && size_hints->min_width > 0 && size_hints->min_height > 0 && (size_hints->max_width == size_hints->min_width |