mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-26 11:48:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal/ui: refactoring: add (*monitors).monitorFromPosition

Browse Source
This commit is contained in:
Hajime Hoshi 2023-09-24 19:30:07 +09:00
parent fab08bac92
commit 0e23045b90
2 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/ui/monitor_glfw.go
View File

@ -84,6 +84,21 @@ func (m *monitors) monitorFromID(id int) *Monitor {
return m.monitors[id] return m.monitors[id]
} }
// monitorFromPosition returns a monitor for the given position (x, y),
// or returns nil if monitor is not found.
func (m *monitors) monitorFromPosition(x, y int) *Monitor {
m.m.Lock()
defer m.m.Unlock()
for _, m := range m.monitors {
// TODO: Fix incorrectness in the cases of https://github.com/glfw/glfw/issues/1961.
if m.x <= x && x < m.x+m.videoMode.Width && m.y <= y && y < m.y+m.videoMode.Height {
return m
}
}
return nil
}
// update must be called from the main thread. // update must be called from the main thread.
func (m *monitors) update() { func (m *monitors) update() {
glfwMonitors := glfw.GetMonitors() glfwMonitors := glfw.GetMonitors()

27
internal/ui/ui_glfw.go
View File

@ -229,18 +229,6 @@ func (u *userInterfaceImpl) Monitor() *Monitor {
return monitor return monitor
} }
// getMonitorFromPosition returns a monitor for the given window x/y,
// or returns nil if monitor is not found.
func getMonitorFromPosition(wx, wy int) *Monitor {
for _, m := range theMonitors.append(nil) {
// TODO: Fix incorrectness in the cases of https://github.com/glfw/glfw/issues/1961.
if m.x <= wx && wx < m.x+m.videoMode.Width && m.y <= wy && wy < m.y+m.videoMode.Height {
return m
}
}
return nil
}
func (u *userInterfaceImpl) isRunning() bool { func (u *userInterfaceImpl) isRunning() bool {
return atomic.LoadUint32(&u.running) != 0 && !u.isTerminated() return atomic.LoadUint32(&u.running) != 0 && !u.isTerminated()
} }
@ -1493,29 +1481,20 @@ func (u *userInterfaceImpl) currentMonitor() *Monitor {
if u.window == nil { if u.window == nil {
return u.getInitMonitor() return u.getInitMonitor()
} }
if m := monitorFromWindow(u.window); m != nil {
return m
}
return theMonitors.monitorFromGLFWMonitor(glfw.GetPrimaryMonitor())
}
// monitorFromWindow returns the monitor from the given window.
//
// monitorFromWindow must be called on the main thread.
func monitorFromWindow(window *glfw.Window) *Monitor {
// Getting a monitor from a window position is not reliable in general (e.g., when a window is put across // Getting a monitor from a window position is not reliable in general (e.g., when a window is put across
// multiple monitors, or, before SetWindowPosition is called.). // multiple monitors, or, before SetWindowPosition is called.).
// Get the monitor which the current window belongs to. This requires OS API. // Get the monitor which the current window belongs to. This requires OS API.
if m := monitorFromWindowByOS(window); m != nil { if m := monitorFromWindowByOS(u.window); m != nil {
return m return m
} }
// As the fallback, detect the monitor from the window. // As the fallback, detect the monitor from the window.
if m := getMonitorFromPosition(window.GetPos()); m != nil { if m := theMonitors.monitorFromPosition(u.window.GetPos()); m != nil {
return m return m
} }
return nil return theMonitors.monitorFromGLFWMonitor(glfw.GetPrimaryMonitor())
} }
func (u *userInterfaceImpl) readInputState(inputState *InputState) { func (u *userInterfaceImpl) readInputState(inputState *InputState) {