fixing conflicts

This commit is contained in:
Jakub Dóka 2020-12-31 20:03:40 +01:00
commit 857c068d8d
3 changed files with 7 additions and 4 deletions

View File

@ -405,10 +405,10 @@ func (w *Window) SetCursorVisible(visible bool) {
// SetCursorDisabled hides the cursor and provides unlimited virtual cursor movement // SetCursorDisabled hides the cursor and provides unlimited virtual cursor movement
// make cursor visible using SetCursorVisible // make cursor visible using SetCursorVisible
func (w *Window) SetCursorDisabled() { func (w *Window) SetCursorDisabled() {
w.cursorVisible = false w.cursorVisible = false
mainthread.Call(func() { mainthread.Call(func() {
w.window.SetInputMode(glfw.CursorMode, glfw.CursorDisabled) w.window.SetInputMode(glfw.CursorMode, glfw.CursorDisabled)
}) })
} }
// CursorVisible returns the visibility status of the mouse cursor. // CursorVisible returns the visibility status of the mouse cursor.

1
test Normal file
View File

@ -0,0 +1 @@
some test file

2
test1 Normal file
View File

@ -0,0 +1,2 @@
some test file
test file with edit