From bf850e12a4c4cc952e85fc5057d971ddcdad09ba Mon Sep 17 00:00:00 2001
From: Hajime Hoshi <hajimehoshi@gmail.com>
Date: Sun, 5 Aug 2018 21:19:22 +0900
Subject: [PATCH] ui: Recalc device scale repeatedly for multiple displays
 (#644)

---
 internal/devicescale/devicescale.go |  9 +++------
 internal/ui/ui_glfw.go              | 19 ++++++++++++++++---
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/internal/devicescale/devicescale.go b/internal/devicescale/devicescale.go
index 230ac4147..0f941f657 100644
--- a/internal/devicescale/devicescale.go
+++ b/internal/devicescale/devicescale.go
@@ -19,15 +19,12 @@ import (
 )
 
 var (
-	scale = 0.0
-	m     sync.Mutex
+	m sync.Mutex
 )
 
 func DeviceScale() float64 {
 	m.Lock()
 	defer m.Unlock()
-	if scale == 0.0 {
-		scale = impl()
-	}
-	return scale
+	// TODO: Cache this value (again) for mobile platforms.
+	return impl()
 }
diff --git a/internal/ui/ui_glfw.go b/internal/ui/ui_glfw.go
index 3d9dee352..f14a5462f 100644
--- a/internal/ui/ui_glfw.go
+++ b/internal/ui/ui_glfw.go
@@ -51,6 +51,10 @@ type userInterface struct {
 	runnableInBackground bool
 	vsync                bool
 
+	deviceScale        float64
+	deviceScaleUpdated int64
+	lastActualScale    float64
+
 	initFullscreen      bool
 	initCursorVisible   bool
 	initWindowDecorated bool
@@ -540,7 +544,13 @@ func (u *userInterface) getScale() float64 {
 
 // actualScreenScale must be called from the main thread.
 func (u *userInterface) actualScreenScale() float64 {
-	return u.getScale() * devicescale.DeviceScale()
+	n := time.Now().UnixNano()
+	// As devicescale.DeviceScale accesses OS API, not call this too often.
+	if u.deviceScale == 0 || n-u.deviceScaleUpdated < int64(time.Second/2) {
+		u.deviceScale = devicescale.DeviceScale()
+		u.deviceScaleUpdated = n
+	}
+	return u.getScale() * u.deviceScale
 }
 
 // pollEvents must be called from the main thread.
@@ -554,11 +564,14 @@ func (u *userInterface) updateGraphicsContext(g GraphicsContext) {
 	sizeChanged := false
 	// TODO: Is it possible to reduce 'runOnMainThread' calls?
 	_ = u.runOnMainThread(func() error {
-		if !u.toChangeSize {
+		actualScale = u.actualScreenScale()
+
+		if !u.toChangeSize && u.lastActualScale == actualScale {
 			return nil
 		}
+
+		u.lastActualScale = actualScale
 		u.toChangeSize = false
-		actualScale = u.actualScreenScale()
 		sizeChanged = true
 		return nil
 	})