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: add setFullscreen

Browse Source
This commit is contained in:
Hajime Hoshi 2022-09-25 22:31:26 +09:00
parent e47f9ac38f
commit c7deed6e72
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
internal/ui/ui_glfw.go
View File

@ -561,7 +561,7 @@ func (u *userInterfaceImpl) SetFullscreen(fullscreen bool) {
if u.isFullscreen() == fullscreen { if u.isFullscreen() == fullscreen {
return return
} }
u.setWindowSizeInDIP(u.origWindowWidthInDIP, u.origWindowHeightInDIP, fullscreen) u.setFullscreen(fullscreen)
}) })
} }
@ -749,7 +749,7 @@ func (u *userInterfaceImpl) registerWindowSetSizeCallback() {
if width != 0 || height != 0 { if width != 0 || height != 0 {
w := int(u.dipFromGLFWPixel(float64(width), u.currentMonitor())) w := int(u.dipFromGLFWPixel(float64(width), u.currentMonitor()))
h := int(u.dipFromGLFWPixel(float64(height), u.currentMonitor())) h := int(u.dipFromGLFWPixel(float64(height), u.currentMonitor()))
u.setWindowSizeInDIP(w, h, u.isFullscreen()) u.setWindowSizeInDIP(w, h)
} }
outsideWidth, outsideHeight := u.outsideSize() outsideWidth, outsideHeight := u.outsideSize()
@ -816,7 +816,7 @@ func (u *userInterfaceImpl) registerWindowFramebufferSizeCallback() {
s := u.deviceScaleFactor(u.currentMonitor()) s := u.deviceScaleFactor(u.currentMonitor())
ww := int(float64(w) / s) ww := int(float64(w) / s)
wh := int(float64(h) / s) wh := int(float64(h) / s)
u.setWindowSizeInDIP(ww, wh, u.isFullscreen()) u.setWindowSizeInDIP(ww, wh)
}) })
} }
u.window.SetFramebufferSizeCallback(u.defaultFramebufferSizeCallback) u.window.SetFramebufferSizeCallback(u.defaultFramebufferSizeCallback)
@ -951,7 +951,7 @@ func (u *userInterfaceImpl) init() error {
wy = max wy = max
} }
u.setWindowPositionInDIP(wx, wy, u.initMonitor) u.setWindowPositionInDIP(wx, wy, u.initMonitor)
u.setWindowSizeInDIP(ww, wh, u.isFullscreen()) u.setWindowSizeInDIP(ww, wh)
// Maximizing a window requires a proper size and position. Call Maximize here (#1117). // Maximizing a window requires a proper size and position. Call Maximize here (#1117).
if u.isInitWindowMaximized() { if u.isInitWindowMaximized() {
@ -1035,7 +1035,7 @@ func (u *userInterfaceImpl) update() (float64, float64, error) {
} }
if u.isInitFullscreen() { if u.isInitFullscreen() {
u.setWindowSizeInDIP(u.origWindowWidthInDIP, u.origWindowHeightInDIP, true) u.setFullscreen(true)
u.setInitFullscreen(false) u.setInitFullscreen(false)
} }
@ -1234,7 +1234,7 @@ func (u *userInterfaceImpl) adjustWindowSizeBasedOnSizeLimitsInDIP(width, height
// //
// TODO: Split this function into two: setting members and calling (*glfw.Window).SetSize. // TODO: Split this function into two: setting members and calling (*glfw.Window).SetSize.
// This function is invoked from the SetSize callback, but calling (*glfw.Window).SetSize from the callback is odd (#1816). // This function is invoked from the SetSize callback, but calling (*glfw.Window).SetSize from the callback is odd (#1816).
func (u *userInterfaceImpl) setWindowSizeInDIP(width, height int, fullscreen bool) { func (u *userInterfaceImpl) setWindowSizeInDIP(width, height int) {
if microsoftgdk.IsXbox() { if microsoftgdk.IsXbox() {
// Do nothing. The size is always fixed. // Do nothing. The size is always fixed.
return return
@ -1248,10 +1248,8 @@ func (u *userInterfaceImpl) setWindowSizeInDIP(width, height int, fullscreen boo
height = 1 height = 1
} }
u.graphicsDriver.SetFullscreen(fullscreen)
scale := u.deviceScaleFactor(u.currentMonitor()) scale := u.deviceScaleFactor(u.currentMonitor())
if u.origWindowWidthInDIP == width && u.origWindowHeightInDIP == height && u.isFullscreen() == fullscreen && u.lastDeviceScaleFactor == scale { if u.origWindowWidthInDIP == width && u.origWindowHeightInDIP == height && u.lastDeviceScaleFactor == scale {
return return
} }
u.lastDeviceScaleFactor = scale u.lastDeviceScaleFactor = scale
@ -1274,13 +1272,22 @@ func (u *userInterfaceImpl) setWindowSizeInDIP(width, height int, fullscreen boo
}() }()
} }
u.setWindowSizeInDIPImpl(width, height, fullscreen) u.setWindowSizeInDIPImpl(width, height, u.isFullscreen())
u.updateWindowSizeLimits() u.updateWindowSizeLimits()
u.adjustViewSize() u.adjustViewSize()
} }
// setFullscreen must be called from the main thread.
func (u *userInterfaceImpl) setFullscreen(fullscreen bool) {
if u.isFullscreen() == fullscreen {
return
}
u.graphicsDriver.SetFullscreen(fullscreen)
u.setWindowSizeInDIPImpl(u.origWindowWidthInDIP, u.origWindowHeightInDIP, fullscreen)
}
func (u *userInterfaceImpl) minimumWindowWidth() int { func (u *userInterfaceImpl) minimumWindowWidth() int {
if u.window.GetAttrib(glfw.Decorated) == glfw.False { if u.window.GetAttrib(glfw.Decorated) == glfw.False {
return 1 return 1
@ -1509,7 +1516,7 @@ func (u *userInterfaceImpl) maximizeWindow() {
w, h := u.window.GetSize() w, h := u.window.GetSize()
ww := int(u.dipFromGLFWPixel(float64(w), u.currentMonitor())) ww := int(u.dipFromGLFWPixel(float64(w), u.currentMonitor()))
wh := int(u.dipFromGLFWPixel(float64(h), u.currentMonitor())) wh := int(u.dipFromGLFWPixel(float64(h), u.currentMonitor()))
u.setWindowSizeInDIP(ww, wh, u.isFullscreen()) u.setWindowSizeInDIP(ww, wh)
} }
// iconifyWindow must be called from the main thread. // iconifyWindow must be called from the main thread.
@ -1563,7 +1570,7 @@ func (u *userInterfaceImpl) restoreWindow() {
w, h := u.window.GetSize() w, h := u.window.GetSize()
ww := int(u.dipFromGLFWPixel(float64(w), u.currentMonitor())) ww := int(u.dipFromGLFWPixel(float64(w), u.currentMonitor()))
wh := int(u.dipFromGLFWPixel(float64(h), u.currentMonitor())) wh := int(u.dipFromGLFWPixel(float64(h), u.currentMonitor()))
u.setWindowSizeInDIP(ww, wh, u.isFullscreen()) u.setWindowSizeInDIP(ww, wh)
} }
} }

2
internal/ui/window_glfw.go
View File

@ -217,7 +217,7 @@ func (w *glfwWindow) SetSize(width, height int) {
if w.ui.isWindowMaximized() && runtime.GOOS != "darwin" { if w.ui.isWindowMaximized() && runtime.GOOS != "darwin" {
return return
} }
w.ui.setWindowSizeInDIP(width, height, w.ui.isFullscreen()) w.ui.setWindowSizeInDIP(width, height)
}) })
} }