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

internal/ui: remove panic in adjustWindowSize

Browse Source
This commit is contained in:
Hajime Hoshi 2024-09-28 02:45:56 +09:00
parent 55308e2d75
commit 2ef823ccd2
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/ui/ui_darwin.go
View File

@ -219,8 +219,8 @@ func dipToGLFWPixel(x float64, scale float64) float64 {
return x return x
} }
func (u *UserInterface) adjustWindowPosition(x, y int, monitor *Monitor) (int, int) { func (u *UserInterface) adjustWindowPosition(x, y int, monitor *Monitor) (int, int, error) {
return x, y return x, y, nil
} }
var ( var (

7
internal/ui/ui_glfw.go
View File

@ -2113,7 +2113,12 @@ func (u *UserInterface) setWindowPositionInDIP(x, y int, monitor *Monitor) error
s := monitor.DeviceScaleFactor() s := monitor.DeviceScaleFactor()
xf := dipToGLFWPixel(float64(x), s) xf := dipToGLFWPixel(float64(x), s)
yf := dipToGLFWPixel(float64(y), s) yf := dipToGLFWPixel(float64(y), s)
if x, y := u.adjustWindowPosition(mx+int(xf), my+int(yf), monitor); f {
x, y, err = u.adjustWindowPosition(mx+int(xf), my+int(yf), monitor)
if err != nil {
return err
}
if f {
u.setOrigWindowPos(x, y) u.setOrigWindowPos(x, y)
} else { } else {
if err := u.window.SetPos(x, y); err != nil { if err := u.window.SetPos(x, y); err != nil {

4
internal/ui/ui_linbsd.go
View File

@ -131,8 +131,8 @@ func dipToGLFWPixel(x float64, deviceScaleFactor float64) float64 {
return x * deviceScaleFactor return x * deviceScaleFactor
} }
func (u *UserInterface) adjustWindowPosition(x, y int, monitor *Monitor) (int, int) { func (u *UserInterface) adjustWindowPosition(x, y int, monitor *Monitor) (int, int, error) {
return x, y return x, y, nil
} }
func initialMonitorByOS() (*Monitor, error) { func initialMonitorByOS() (*Monitor, error) {

8
internal/ui/ui_windows.go
View File

@ -110,9 +110,9 @@ func dipToGLFWPixel(x float64, deviceScaleFactor float64) float64 {
return x * deviceScaleFactor return x * deviceScaleFactor
} }
func (u *UserInterface) adjustWindowPosition(x, y int, monitor *Monitor) (int, int) { func (u *UserInterface) adjustWindowPosition(x, y int, monitor *Monitor) (int, int, error) {
if microsoftgdk.IsXbox() { if microsoftgdk.IsXbox() {
return x, y return x, y, nil
} }
mx := monitor.boundsInGLFWPixels.Min.X mx := monitor.boundsInGLFWPixels.Min.X
@ -124,12 +124,12 @@ func (u *UserInterface) adjustWindowPosition(x, y int, monitor *Monitor) (int, i
} }
t, err := _GetSystemMetrics(_SM_CYCAPTION) t, err := _GetSystemMetrics(_SM_CYCAPTION)
if err != nil { if err != nil {
panic(err) return 0, 0, err
} }
if y < my+int(t) { if y < my+int(t) {
y = my + int(t) y = my + int(t)
} }
return x, y return x, y, nil
} }
func initialMonitorByOS() (*Monitor, error) { func initialMonitorByOS() (*Monitor, error) {