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

uidriver/glfw: Bug fix: Treat X scale (HiDPI) correctly

Browse Source 
Fixes #1350
This commit is contained in:
Hajime Hoshi 2020-09-19 01:24:16 +09:00
parent 40e35fa047
commit 51f06139a6
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/glfw/glfw_notwindows.go
View File

@ -62,6 +62,10 @@ type Monitor struct {
m *glfw.Monitor m *glfw.Monitor
} }
func (m *Monitor) GetContentScale() (float32, float32) {
return m.m.GetContentScale()
}
func (m *Monitor) GetPos() (x, y int) { func (m *Monitor) GetPos() (x, y int) {
return m.m.GetPos() return m.m.GetPos()
} }

11
internal/uidriver/glfw/ui_unix.go
View File

@ -29,17 +29,22 @@ func (u *UserInterface) fromGLFWMonitorPixel(x float64) float64 {
// fromGLFWPixel must be called from the main thread. // fromGLFWPixel must be called from the main thread.
func (u *UserInterface) fromGLFWPixel(x float64) float64 { func (u *UserInterface) fromGLFWPixel(x float64) float64 {
return x // deviceScaleFactor() is a scale by desktop environment (e.g., Cinnamon), while GetContentScale() is X's scale.
// They are different things and then need to be treated different ways (#1350).
s, _ := currentMonitor(u.window).GetContentScale()
return x / float64(s)
} }
// toGLFWPixel must be called from the main thread. // toGLFWPixel must be called from the main thread.
func (u *UserInterface) toGLFWPixel(x float64) float64 { func (u *UserInterface) toGLFWPixel(x float64) float64 {
return x s, _ := currentMonitor(u.window).GetContentScale()
return x * float64(s)
} }
// toFramebufferPixel must be called from the main thread. // toFramebufferPixel must be called from the main thread.
func (u *UserInterface) toFramebufferPixel(x float64) float64 { func (u *UserInterface) toFramebufferPixel(x float64) float64 {
return x / u.deviceScaleFactor() s, _ := currentMonitor(u.window).GetContentScale()
return x / u.deviceScaleFactor() * float64(s)
} }
func (u *UserInterface) adjustWindowPosition(x, y int) (int, int) { func (u *UserInterface) adjustWindowPosition(x, y int) (int, int) {