diff options
| author | emersion <contact@emersion.fr> | 2018-09-06 21:28:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-06 21:28:51 +0200 |
| commit | f3b96d4050bcf0136e0878d8102e47fdb0ec6f98 (patch) | |
| tree | 81a8494bf29b4f9aea70ff71ac37e785cf9cf478 | |
| parent | ed9e7bb8f4c8bbe6b795e2df85fb71ce9c7ab6fd (diff) | |
| parent | cf32d5d7766a14ad1fbb236371be3e6b733c4f8a (diff) | |
| download | sway-f3b96d4050bcf0136e0878d8102e47fdb0ec6f98.tar.xz | |
Merge pull request #2594 from RyanDwyer/fix-pinentry
Float views when min == max on either dimension
| -rw-r--r-- | sway/desktop/xdg_shell.c | 4 | ||||
| -rw-r--r-- | sway/desktop/xdg_shell_v6.c | 4 | ||||
| -rw-r--r-- | sway/desktop/xwayland.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c index 575f229d..b9ca396a 100644 --- a/sway/desktop/xdg_shell.c +++ b/sway/desktop/xdg_shell.c @@ -170,8 +170,8 @@ static bool wants_floating(struct sway_view *view) { struct wlr_xdg_toplevel *toplevel = view->wlr_xdg_surface->toplevel; struct wlr_xdg_toplevel_state *state = &toplevel->current; return (state->min_width != 0 && state->min_height != 0 - && state->min_width == state->max_width - && state->min_height == state->max_height) + && (state->min_width == state->max_width + || state->min_height == state->max_height)) || toplevel->parent; } diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c index 58fbd631..0c121adc 100644 --- a/sway/desktop/xdg_shell_v6.c +++ b/sway/desktop/xdg_shell_v6.c @@ -166,8 +166,8 @@ static bool wants_floating(struct sway_view *view) { view->wlr_xdg_surface_v6->toplevel; struct wlr_xdg_toplevel_v6_state *state = &toplevel->current; return (state->min_width != 0 && state->min_height != 0 - && state->min_width == state->max_width - && state->min_height == state->max_height) + && (state->min_width == state->max_width + || state->min_height == state->max_height)) || toplevel->parent; } diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index 0d192b76..6761b6bc 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c @@ -235,8 +235,8 @@ static bool wants_floating(struct sway_view *view) { struct wlr_xwayland_surface_size_hints *size_hints = surface->size_hints; if (size_hints != NULL && size_hints->min_width != 0 && size_hints->min_height != 0 && - size_hints->max_width == size_hints->min_width && - size_hints->max_height == size_hints->min_height) { + (size_hints->max_width == size_hints->min_width || + size_hints->max_height == size_hints->min_height)) { return true; } |