aboutsummaryrefslogtreecommitdiffstats
path: root/sway
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <RedSoxFan@users.noreply.github.com>2018-10-22 17:32:39 -0400
committerLibravatar GitHub <noreply@github.com>2018-10-22 17:32:39 -0400
commitbb06a57a71074c1ecd570209fa6f1b12523fed8a (patch)
tree8e1637e3cd45a12c1e4c1df98ceced408136fc37 /sway
parentFix crash when resizing container hidden in the scratchpad (diff)
parentMerge pull request #2926 from RyanDwyer/fix-xwayland-floating-logic (diff)
downloadsway-bb06a57a71074c1ecd570209fa6f1b12523fed8a.tar.gz
sway-bb06a57a71074c1ecd570209fa6f1b12523fed8a.tar.zst
sway-bb06a57a71074c1ecd570209fa6f1b12523fed8a.zip
Merge branch 'master' into fix-scratchpad-resize
Diffstat (limited to 'sway')
-rw-r--r--sway/desktop/xwayland.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index b8ac8434..5305ce12 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -239,7 +239,7 @@ static bool wants_floating(struct sway_view *view) {
239 239
240 struct wlr_xwayland_surface_size_hints *size_hints = surface->size_hints; 240 struct wlr_xwayland_surface_size_hints *size_hints = surface->size_hints;
241 if (size_hints != NULL && 241 if (size_hints != NULL &&
242 size_hints->min_width != 0 && size_hints->min_height != 0 && 242 size_hints->min_width > 0 && size_hints->min_height > 0 &&
243 (size_hints->max_width == size_hints->min_width || 243 (size_hints->max_width == size_hints->min_width ||
244 size_hints->max_height == size_hints->min_height)) { 244 size_hints->max_height == size_hints->min_height)) {
245 return true; 245 return true;