From 6a8e45e6c154adf28ce8c742eb517c95df4a2022 Mon Sep 17 00:00:00 2001
From: Hajime Hoshi <hajimehoshi@gmail.com>
Date: Sun, 13 Feb 2022 19:31:23 +0900
Subject: [PATCH] internal/ui: refactoring: simplify ResetForFrame

Updating the layout is already done every frame, so doing this in
ResetForFrame is not needed.

Updates #490
---
 internal/ui/ui_glfw.go   | 6 ------
 internal/ui/ui_js.go     | 1 -
 internal/ui/ui_mobile.go | 4 +---
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/internal/ui/ui_glfw.go b/internal/ui/ui_glfw.go
index 6242709ff..f6748f102 100644
--- a/internal/ui/ui_glfw.go
+++ b/internal/ui/ui_glfw.go
@@ -1350,12 +1350,6 @@ func (u *UserInterface) IsScreenTransparent() bool {
 }
 
 func (u *UserInterface) ResetForFrame() {
-	// The offscreens must be updated every frame (#490).
-	var w, h float64
-	u.t.Call(func() {
-		w, h = u.updateSize()
-	})
-	u.context.layout(w, h)
 	u.input.resetForFrame()
 
 	u.m.Lock()
diff --git a/internal/ui/ui_js.go b/internal/ui/ui_js.go
index f3ac71ef0..06675a32c 100644
--- a/internal/ui/ui_js.go
+++ b/internal/ui/ui_js.go
@@ -637,7 +637,6 @@ func (u *UserInterface) IsScreenTransparent() bool {
 }
 
 func (u *UserInterface) ResetForFrame() {
-	u.updateSize()
 	u.input.resetForFrame()
 }
 
diff --git a/internal/ui/ui_mobile.go b/internal/ui/ui_mobile.go
index bce294d54..8536374dd 100644
--- a/internal/ui/ui_mobile.go
+++ b/internal/ui/ui_mobile.go
@@ -290,8 +290,6 @@ func (u *UserInterface) run(context Context, mainloop bool) (err error) {
 		<-u.setGBuildSizeCh
 	}
 
-	// Force to set the screen size
-	u.layoutIfNeeded()
 	for {
 		if err := u.update(); err != nil {
 			return err
@@ -330,6 +328,7 @@ func (u *UserInterface) update() error {
 		renderEndCh <- struct{}{}
 	}()
 
+	u.layoutIfNeeded()
 	if err := u.context.updateFrame(deviceScale()); err != nil {
 		return err
 	}
@@ -433,7 +432,6 @@ func (u *UserInterface) IsScreenTransparent() bool {
 }
 
 func (u *UserInterface) ResetForFrame() {
-	u.layoutIfNeeded()
 	u.input.resetForFrame()
 }