fix: only the candidates of the first page could be selected in popup…

… window feat: add `selectPagedCandidate` and `deletePagedCanidate` to new api implementation
osfans · Nov 11, 2024 · fafb034 · fafb034
1 parent 14c3424
commit fafb034
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/app/src/main/java/com/osfans/trime/core/Rime.kt b/app/src/main/java/com/osfans/trime/core/Rime.kt
@@ -116,6 +116,16 @@ class Rime :
             forgetRimeCandidate(idx).also { if (it) ipcResponseCallback() }
         }
 
+    override suspend fun selectPagedCandidate(idx: Int): Boolean =
+        withRimeContext {
+            selectRimeCandidateOnCurrentPage(idx).also { if (it) ipcResponseCallback() }
+        }
+
+    override suspend fun deletedPagedCandidate(idx: Int): Boolean =
+        withRimeContext {
+            deleteRimeCandidateOnCurrentPage(idx).also { if (it) ipcResponseCallback() }
+        }
+
     override suspend fun availableSchemata(): Array<SchemaItem> = withRimeContext { getAvailableRimeSchemaList() }
 
     override suspend fun enabledSchemata(): Array<SchemaItem> = withRimeContext { getSelectedRimeSchemaList() }

diff --git a/app/src/main/java/com/osfans/trime/core/RimeApi.kt b/app/src/main/java/com/osfans/trime/core/RimeApi.kt
@@ -37,6 +37,10 @@ interface RimeApi {
 
     suspend fun forgetCandidate(idx: Int): Boolean
 
+    suspend fun selectPagedCandidate(idx: Int): Boolean
+
+    suspend fun deletedPagedCandidate(idx: Int): Boolean
+
     suspend fun availableSchemata(): Array<SchemaItem>
 
     suspend fun enabledSchemata(): Array<SchemaItem>

diff --git a/app/src/main/java/com/osfans/trime/ime/composition/CompositionPopupWindow.kt b/app/src/main/java/com/osfans/trime/ime/composition/CompositionPopupWindow.kt
@@ -56,7 +56,7 @@ class CompositionPopupWindow(
                 updatePopupWindow(x.toInt(), y.toInt())
             }
             setOnSelectCandidateListener { idx ->
-                rime.launchOnReady { it.selectCandidate(idx) }
+                rime.launchOnReady { it.selectPagedCandidate(idx) }
             }
         }