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

internal/ui: bug fix: recover the cursor shape when the cursor is visible

Browse Source 
Closes #2527
This commit is contained in:
Hajime Hoshi 2023-01-07 20:03:17 +09:00
parent 86fa9366f7
commit 95f1ef0fb9
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
examples/cursor/main.go
View File

@ -21,6 +21,7 @@ import (
"github.com/hajimehoshi/ebiten/v2" "github.com/hajimehoshi/ebiten/v2"
"github.com/hajimehoshi/ebiten/v2/ebitenutil" "github.com/hajimehoshi/ebiten/v2/ebitenutil"
"github.com/hajimehoshi/ebiten/v2/inpututil"
"github.com/hajimehoshi/ebiten/v2/vector" "github.com/hajimehoshi/ebiten/v2/vector"
) )
@ -36,13 +37,24 @@ type Game struct {
func (g *Game) Update() error { func (g *Game) Update() error {
pt := image.Pt(ebiten.CursorPosition()) pt := image.Pt(ebiten.CursorPosition())
cursor := ebiten.CursorShapeDefault
for r, c := range g.grids { for r, c := range g.grids {
if pt.In(r) { if pt.In(r) {
ebiten.SetCursorShape(c) cursor = c
return nil break
} }
} }
ebiten.SetCursorShape(ebiten.CursorShapeDefault) ebiten.SetCursorShape(cursor)
if inpututil.IsKeyJustPressed(ebiten.KeyC) {
switch ebiten.CursorMode() {
case ebiten.CursorModeVisible:
ebiten.SetCursorMode(ebiten.CursorModeHidden)
case ebiten.CursorModeHidden:
ebiten.SetCursorMode(ebiten.CursorModeVisible)
}
}
return nil return nil
} }

3
internal/ui/ui_glfw.go
View File

@ -614,6 +614,9 @@ func (u *userInterfaceImpl) SetCursorMode(mode CursorMode) {
} }
u.mainThread.Call(func() { u.mainThread.Call(func() {
u.window.SetInputMode(glfw.CursorMode, driverCursorModeToGLFWCursorMode(mode)) u.window.SetInputMode(glfw.CursorMode, driverCursorModeToGLFWCursorMode(mode))
if mode == CursorModeVisible {
u.setNativeCursor(u.getCursorShape())
}
}) })
} }