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

app,widget,io: implement IME positioning

Browse Source 
This change implements reporting of the caret position from Editor, as well
as Windows, macOS, Android support. As a result, the IME composition window
on Windows and macOS is now positioned correctly.

References: https://todo.sr.ht/~eliasnaur/gio/246
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2022-02-13 16:28:30 +01:00
parent cffa748c6a
commit 31f55232bf
13 changed files with 295 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/os_android.go
+14 -2
View File
@@ -123,6 +123,7 @@ import (
"fmt"
"image"
"image/color"
"math"
"os"
"path/filepath"
"reflect"
@@ -190,6 +191,7 @@ var gioView struct {
isA11yActive C.jmethodID
restartInput C.jmethodID
updateSelection C.jmethodID
updateCaret C.jmethodID
}
// ViewEvent is sent whenever the Window's underlying Android view
@@ -475,6 +477,7 @@ func Java_org_gioui_GioView_onCreateView(env *C.JNIEnv, class C.jclass, view C.j
m.isA11yActive = getMethodID(env, class, "isA11yActive", "()Z")
m.restartInput = getMethodID(env, class, "restartInput", "()V")
m.updateSelection = getMethodID(env, class, "updateSelection", "()V")
m.updateCaret = getMethodID(env, class, "updateCaret", "(FFFFFFFFFF)V")
})
view = C.jni_NewGlobalRef(env, view)
wopts := <-mainWindow.out
@@ -1101,10 +1104,19 @@ func (w *window) EditorStateChanged(old, new editorState) {
callVoidMethod(env, w.view, gioView.restartInput)
return
}
if old.Selection != new.Selection {
if old.Selection.Range != new.Selection.Range {
w.callbacks.SetComposingRegion(key.Range{Start: -1, End: -1})
callVoidMethod(env, w.view, gioView.updateSelection)
}
if old.Selection.Transform != new.Selection.Transform || old.Selection.Caret != new.Selection.Caret {
sel := new.Selection
m00, m01, m02, m10, m11, m12 := sel.Transform.Elems()
f := func(v float32) jvalue {
return jvalue(math.Float32bits(v))
}
c := sel.Caret
callVoidMethod(env, w.view, gioView.updateCaret, f(m00), f(m01), f(m02), f(m10), f(m11), f(m12), f(c.Pos.X), f(c.Pos.Y-c.Ascent), f(c.Pos.Y), f(c.Pos.Y+c.Descent))
}
callVoidMethod(env, w.view, gioView.updateSelection)
})
}