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

app: [macOS] don't reset IME snippet when not needed

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2022-02-13 17:30:37 +01:00
parent 27e0b9cc7d
commit 3eeb08b4a1
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/os_macos.go
+8 -5
View File
@@ -580,17 +580,20 @@ func gio_setMarkedText(view, cstr C.CFTypeRef, selRange C.NSRange, replaceRange
} }
//export gio_substringForProposedRange //export gio_substringForProposedRange
func gio_substringForProposedRange(view C.CFTypeRef, rng C.NSRange, actual C.NSRangePointer) C.CFTypeRef { func gio_substringForProposedRange(view C.CFTypeRef, crng C.NSRange, actual C.NSRangePointer) C.CFTypeRef {
w := mustView(view) w := mustView(view)
state := w.w.EditorState() state := w.w.EditorState()
start, end := state.Snippet.Start, state.Snippet.End start, end := state.Snippet.Start, state.Snippet.End
if start > end { if start > end {
start, end = end, start start, end = end, start
} }
w.w.SetEditorSnippet(key.Range{ rng := key.Range{
Start: state.RunesIndex(int(rng.location)), Start: state.RunesIndex(int(crng.location)),
End: state.RunesIndex(int(rng.location + rng.length)), End: state.RunesIndex(int(crng.location + crng.length)),
}) }
if rng.Start < start || end < rng.End {
w.w.SetEditorSnippet(rng)
}
u16start := state.UTF16Index(start) u16start := state.UTF16Index(start)
actual.location = C.NSUInteger(u16start) actual.location = C.NSUInteger(u16start)
actual.length = C.NSUInteger(state.UTF16Index(end) - u16start) actual.length = C.NSUInteger(state.UTF16Index(end) - u16start)