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

ui: Bug fix: Consider that (frame buffer width) / (window width) can be more than 1 (#164)

Browse Source
This commit is contained in:
Hajime Hoshi 2016-02-26 03:44:07 +09:00
parent fc7be5be3c
commit 868eef0c2f
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
internal/ui/ui_glfw.go
View File

@ -104,6 +104,7 @@ type userInterface struct {
height int height int
scale int scale int
deviceScaleFactor float64 deviceScaleFactor float64
framebufferScale int
context *opengl.Context context *opengl.Context
} }
@ -112,6 +113,7 @@ func (u *userInterface) start(width, height, scale int, title string) (actualSca
v := m.GetVideoMode() v := m.GetVideoMode()
mw, _ := m.GetPhysicalSize() mw, _ := m.GetPhysicalSize()
u.deviceScaleFactor = 1 u.deviceScaleFactor = 1
u.framebufferScale = 1
// mw can be 0 on some environment like Linux VM // mw can be 0 on some environment like Linux VM
if 0 < mw { if 0 < mw {
dpi := float64(v.Width) * 25.4 / float64(mw) dpi := float64(v.Width) * 25.4 / float64(mw)
@ -122,15 +124,17 @@ func (u *userInterface) start(width, height, scale int, title string) (actualSca
u.window.SetTitle(title) u.window.SetTitle(title)
u.window.Show() u.window.Show()
x := (v.Width - width*u.actualScale()) / 2 s := int(float64(scale) * u.deviceScaleFactor)
y := (v.Height - height*u.actualScale()) / 3 println(s)
x := (v.Width - width*s) / 2
y := (v.Height - height*s) / 3
u.window.SetPos(x, y) u.window.SetPos(x, y)
return u.actualScale(), nil return u.actualScale(), nil
} }
func (u *userInterface) actualScale() int { func (u *userInterface) actualScale() int {
return int(float64(u.scale) * u.deviceScaleFactor) return int(float64(u.scale)*u.deviceScaleFactor) * u.framebufferScale
} }
func (u *userInterface) pollEvents() error { func (u *userInterface) pollEvents() error {
@ -172,7 +176,6 @@ func (u *userInterface) setScreenSize(width, height, scale int) bool {
if u.width == width && u.height == height && u.scale == scale { if u.width == width && u.height == height && u.scale == scale {
return false return false
} }
u.scale = scale
// To make sure the current existing framebuffers are rendered, // To make sure the current existing framebuffers are rendered,
// swap buffers here before SetSize is called. // swap buffers here before SetSize is called.
@ -185,7 +188,8 @@ func (u *userInterface) setScreenSize(width, height, scale int) bool {
window.SetFramebufferSizeCallback(nil) window.SetFramebufferSizeCallback(nil)
close(ch) close(ch)
}) })
window.SetSize(width*u.actualScale(), height*u.actualScale()) s := int(float64(scale) * u.deviceScaleFactor)
window.SetSize(width*s, height*s)
event: event:
for { for {
@ -196,7 +200,11 @@ event:
default: default:
} }
} }
// This is usually 1, but sometimes more than 1 (e.g. Retina Mac)
fw, _ := window.GetFramebufferSize()
u.framebufferScale = fw / width / scale
u.width = width u.width = width
u.height = height u.height = height
u.scale = scale
return true return true
} }