Skip to content

Commit 185c328

Browse files
committed
fix: only the candidates of the first page could be selected in popup window
feat: add `selectPagedCandidate` and `deletePagedCanidate` to new api implementation
1 parent 9506fd7 commit 185c328

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

app/src/main/java/com/osfans/trime/core/Rime.kt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,16 @@ class Rime :
116116
forgetRimeCandidate(idx).also { if (it) ipcResponseCallback() }
117117
}
118118

119+
override suspend fun selectPagedCandidate(idx: Int): Boolean =
120+
withRimeContext {
121+
selectRimeCandidateOnCurrentPage(idx).also { if (it) ipcResponseCallback() }
122+
}
123+
124+
override suspend fun deletedPagedCandidate(idx: Int): Boolean =
125+
withRimeContext {
126+
deleteRimeCandidateOnCurrentPage(idx).also { if (it) ipcResponseCallback() }
127+
}
128+
119129
override suspend fun availableSchemata(): Array<SchemaItem> = withRimeContext { getAvailableRimeSchemaList() }
120130

121131
override suspend fun enabledSchemata(): Array<SchemaItem> = withRimeContext { getSelectedRimeSchemaList() }

app/src/main/java/com/osfans/trime/core/RimeApi.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ interface RimeApi {
3737

3838
suspend fun forgetCandidate(idx: Int): Boolean
3939

40+
suspend fun selectPagedCandidate(idx: Int): Boolean
41+
42+
suspend fun deletedPagedCandidate(idx: Int): Boolean
43+
4044
suspend fun availableSchemata(): Array<SchemaItem>
4145

4246
suspend fun enabledSchemata(): Array<SchemaItem>

app/src/main/java/com/osfans/trime/ime/composition/CompositionPopupWindow.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class CompositionPopupWindow(
5656
updatePopupWindow(x.toInt(), y.toInt())
5757
}
5858
setOnSelectCandidateListener { idx ->
59-
rime.launchOnReady { it.selectCandidate(idx) }
59+
rime.launchOnReady { it.selectPagedCandidate(idx) }
6060
}
6161
}
6262

0 commit comments

Comments
 (0)