internal/devicescale: bug fix: glfw.Monitor.GetContentScale might ret…

…urn 0 Retrying to call GetContentScale solved this. Closes hajimehoshi#2051
obe007 · Apr 3, 2022 · ca6f4fc · ca6f4fc
1 parent 6f87e49
commit ca6f4fc
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/internal/devicescale/impl_desktop.go b/internal/devicescale/impl_desktop.go
@@ -35,6 +35,13 @@ func monitorAt(x, y int) *glfw.Monitor {
 }
 
 func impl(x, y int) float64 {
-	sx, _ := monitorAt(x, y).GetContentScale()
-	return float64(sx)
+	// Keep calling GetContentScale until the returned scale is 0 (#2051).
+	// Retry this at most 5 times to avoid an inifinite loop.
+	for i := 0; i < 5; i++ {
+		sx, _ := monitorAt(x, y).GetContentScale()
+		if sx != 0 {
+			return float64(sx)
+		}
+	}
+	return 1
 }