Merge remote-tracking branch 'upstream/master' into output-damage

This commit is contained in:
emersion 2018-02-09 14:50:26 +01:00
commit cdd55b5d19
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
8 changed files with 86 additions and 43 deletions

View file

@ -327,7 +327,11 @@ void wlr_output_layout_closest_point(struct wlr_output_layout *layout,
output_distance =
(x - output_x) * (x - output_x) + (y - output_y) * (y - output_y);
if (output_distance < min_distance) {
if (!isfinite(output_distance)) {
output_distance = DBL_MAX;
}
if (output_distance <= min_distance) {
min_x = output_x;
min_y = output_y;
min_distance = output_distance;