joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-07 18:35:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

app,io/pointer: [API] remove CursorNameOp and rename CursorName -> Cursor

Browse Source 
It's now possible to directly user pointer.Cursor to add to the ops.

   pointer.CursorText.Add(gtx.Ops)

This is an API change. Use pointer.Cursor directly instead of CursorNameOp.

Signed-off-by: Egon Elbre <egonelbre@gmail.com>
This commit is contained in:
Egon Elbre
2022-02-26 12:54:42 +02:00
committed by Elias Naur
parent 4172566aad
commit cdb288d1f9
18 changed files with 57 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/os_windows.go
+6 -6
View File
@@ -704,8 +704,8 @@ func (w *window) writeClipboard(s string) error {
return nil
}
func (w *window) SetCursor(name pointer.CursorName) {
c, err := loadCursor(name)
func (w *window) SetCursor(cursor pointer.Cursor) {
c, err := loadCursor(cursor)
if err != nil {
c = resources.cursor
}
@@ -715,7 +715,7 @@ func (w *window) SetCursor(name pointer.CursorName) {
}
}
// windowsCursor contains mapping from CursorName to an IDC.
// windowsCursor contains mapping from pointer.Cursor to an IDC.
var windowsCursor = [...]uint16{
pointer.CursorDefault: windows.IDC_ARROW,
pointer.CursorNone: 0,
@@ -745,14 +745,14 @@ var windowsCursor = [...]uint16{
pointer.CursorNorthWestSouthEastResize: windows.IDC_SIZENWSE,
}
func loadCursor(name pointer.CursorName) (syscall.Handle, error) {
switch name {
func loadCursor(cursor pointer.Cursor) (syscall.Handle, error) {
switch cursor {
case pointer.CursorDefault:
return resources.cursor, nil
case pointer.CursorNone:
return 0, nil
default:
return windows.LoadCursor(windowsCursor[name])
return windows.LoadCursor(windowsCursor[cursor])
}
}