mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2025-01-26 02:42:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

ui: Bug fix: fullscreen scale calculation was wrong (#267)

Browse Source
This commit is contained in:
Hajime Hoshi 2017-06-30 02:08:12 +09:00
parent 2996f778b6
commit 1d60c009ed
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
image.go
View File

@ -293,9 +293,9 @@ func checkSize(width, height int) {
panic("ebiten: height must be more than 0") panic("ebiten: height must be more than 0")
} }
if width > MaxImageSize { if width > MaxImageSize {
panic(fmt.Sprintf("ebiten: width must be less than or equal to %d", MaxImageSize)) panic(fmt.Sprintf("ebiten: width (%d) must be less than or equal to %d", width, MaxImageSize))
} }
if height > MaxImageSize { if height > MaxImageSize {
panic(fmt.Sprintf("ebiten: height must be less than or equal to %d", MaxImageSize)) panic(fmt.Sprintf("ebiten: height (%d) must be less than or equal to %d", height, MaxImageSize))
} }
} }

7
internal/ui/ui_glfw.go
View File

@ -245,10 +245,13 @@ func (u *userInterface) getScale() float64 {
return u.scale return u.scale
} }
if u.fullscreenScale == 0 { if u.fullscreenScale == 0 {
if u.glfwScale == 0 {
u.glfwScale = glfwScale()
}
m := glfw.GetPrimaryMonitor() m := glfw.GetPrimaryMonitor()
v := m.GetVideoMode() v := m.GetVideoMode()
sw := float64(v.Width) / float64(u.width) sw := float64(v.Width) / u.glfwScale / float64(u.width)
sh := float64(v.Height) / float64(u.height) sh := float64(v.Height) / u.glfwScale / float64(u.height)
s := sw s := sw
if s > sh { if s > sh {
s = sh s = sh