Merge branch 'master' into fix-scratchpad-resize

This commit is contained in:
Brian Ashworth 2018-10-22 17:32:39 -04:00 committed by GitHub
commit bb06a57a71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -239,7 +239,7 @@ static bool wants_floating(struct sway_view *view) {
struct wlr_xwayland_surface_size_hints *size_hints = surface->size_hints; struct wlr_xwayland_surface_size_hints *size_hints = surface->size_hints;
if (size_hints != NULL && if (size_hints != NULL &&
size_hints->min_width != 0 && size_hints->min_height != 0 && size_hints->min_width > 0 && size_hints->min_height > 0 &&
(size_hints->max_width == size_hints->min_width || (size_hints->max_width == size_hints->min_width ||
size_hints->max_height == size_hints->min_height)) { size_hints->max_height == size_hints->min_height)) {
return true; return true;