sway

commit cf32d5d7766a14ad1fbb236371be3e6b733c4f8a
parent 4a3b705a12ad791ff93392716febd11e46ecffd5
Author: Ryan Dwyer <ryandwyer1@gmail.com>
Date:   Thu,  6 Sep 2018 23:57:57 +1000

Float views when min == max on either dimension

This fixes pinentry-gtk-2, but might make other views floating which
would otherwise be tiled. This patch is more of a trial which could end
up becoming a permanent fix.

Diffstat:
M
sway/desktop/xdg_shell.c
 | 
4
++--
M
sway/desktop/xdg_shell_v6.c
 | 
4
++--
M
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
@@ -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
@@ -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
@@ -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;
 	}