mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-25 03:08:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal/ui: refactoring

Browse Source
This commit is contained in:
Hajime Hoshi 2022-08-10 21:34:39 +09:00
parent b5196a5a7c
commit 4104abdf77
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
internal/ui/ui_glfw.go
View File

@ -1470,6 +1470,7 @@ func (u *userInterfaceImpl) Window() Window {
// maximizeWindow must be called from the main thread. // maximizeWindow must be called from the main thread.
func (u *userInterfaceImpl) maximizeWindow() { func (u *userInterfaceImpl) maximizeWindow() {
// TODO: Can we remove this condition?
if u.isNativeFullscreen() { if u.isNativeFullscreen() {
return return
} }
@ -1482,25 +1483,28 @@ func (u *userInterfaceImpl) maximizeWindow() {
} }
u.window.Maximize() u.window.Maximize()
if !u.isFullscreen() { if u.isFullscreen() {
// On Linux/UNIX, maximizing might not finish even though Maximize returns. Just wait for its finish. return
// Do not check this in the fullscreen since apparently the condition can never be true.
for u.window.GetAttrib(glfw.Maximized) != glfw.True {
glfw.PollEvents()
}
// Call setWindowSize explicitly in order to update the rendering since the callback is disabled now.
// Do not call setWindowSize in the fullscreen mode since setWindowSize requires the window size
// before the fullscreen, while window.GetSize() returns the desktop screen size in the fullscreen mode.
w, h := u.window.GetSize()
ww := int(u.dipFromGLFWPixel(float64(w), u.currentMonitor()))
wh := int(u.dipFromGLFWPixel(float64(h), u.currentMonitor()))
u.setWindowSizeInDIP(ww, wh, u.isFullscreen())
} }
// On Linux/UNIX, maximizing might not finish even though Maximize returns. Just wait for its finish.
// Do not check this in the fullscreen since apparently the condition can never be true.
for u.window.GetAttrib(glfw.Maximized) != glfw.True {
glfw.PollEvents()
}
// Call setWindowSize explicitly in order to update the rendering since the callback is disabled now.
// Do not call setWindowSize in the fullscreen mode since setWindowSize requires the window size
// before the fullscreen, while window.GetSize() returns the desktop screen size in the fullscreen mode.
w, h := u.window.GetSize()
ww := int(u.dipFromGLFWPixel(float64(w), u.currentMonitor()))
wh := int(u.dipFromGLFWPixel(float64(h), u.currentMonitor()))
u.setWindowSizeInDIP(ww, wh, u.isFullscreen())
} }
// iconifyWindow must be called from the main thread. // iconifyWindow must be called from the main thread.
func (u *userInterfaceImpl) iconifyWindow() { func (u *userInterfaceImpl) iconifyWindow() {
// Iconifying a native fullscreen window on macOS is forbidden.
if u.isNativeFullscreen() { if u.isNativeFullscreen() {
return return
} }