From 220a8f48ac0502946bebe4f3dbc8838d7172566c Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Wed, 29 Dec 2021 22:26:56 +0900 Subject: [PATCH] internal/uidriver/glfw: refactoring: remove initTitle --- internal/uidriver/glfw/ui.go | 15 --------------- internal/uidriver/glfw/window.go | 4 +++- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/internal/uidriver/glfw/ui.go b/internal/uidriver/glfw/ui.go index 9a05583ed..77b9b8728 100644 --- a/internal/uidriver/glfw/ui.go +++ b/internal/uidriver/glfw/ui.go @@ -86,7 +86,6 @@ type UserInterface struct { initFullscreenWidthInDIP int initFullscreenHeightInDIP int - initTitle string initFullscreen bool initCursorMode driver.CursorMode initWindowDecorated bool @@ -284,19 +283,6 @@ func (u *UserInterface) setWindowSizeLimitsInDIP(minw, minh, maxw, maxh int) boo return true } -func (u *UserInterface) getInitTitle() string { - u.m.RLock() - v := u.initTitle - u.m.RUnlock() - return v -} - -func (u *UserInterface) setInitTitle(title string) { - u.m.RLock() - u.initTitle = title - u.m.RUnlock() -} - func (u *UserInterface) isInitFullscreen() bool { u.m.RLock() v := u.initFullscreen @@ -927,7 +913,6 @@ func (u *UserInterface) init() error { u.window.Maximize() } - u.title = u.getInitTitle() u.window.SetTitle(u.title) u.window.Show() diff --git a/internal/uidriver/glfw/window.go b/internal/uidriver/glfw/window.go index 7ad703627..fbc697f3b 100644 --- a/internal/uidriver/glfw/window.go +++ b/internal/uidriver/glfw/window.go @@ -258,7 +258,9 @@ func (w *window) SetIcon(iconImages []image.Image) { func (w *window) SetTitle(title string) { if !w.ui.isRunning() { - w.ui.setInitTitle(title) + w.ui.m.Lock() + w.ui.title = title + w.ui.m.Unlock() return } w.ui.title = title