dox4/fcitx5-android
1
0
Fork 0
mirror of https://github.com/fcitx5-android/fcitx5-android.git synced 2026-08-02 04:44:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix/fdroid-build-remove-yoga

Browse Source
This commit is contained in:
rocka 2026-03-27 00:40:09 +08:00 committed by GitHub
commit 71d5929cda
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/dictionaries/project.xml generated
View File

@ -27,6 +27,7 @@
<w>libevent</w>
<w>libime</w>
<w>libintl</w>
<w>libthai</w>
<w>ljava</w>
<w>nihaoshijie</w>
<w>orphis</w>

4
app/src/main/cpp/androidfrontend/androidfrontend.cpp
View File

@ -87,7 +87,7 @@ public:
auto &candidate = bulk->candidateFromAll(i);
// maybe unnecessary; I don't see anywhere using `CandidateWord::setPlaceHolder`
// if (candidate.isPlaceHolder()) continue;
candidates.emplace_back(filterString(candidate.textWithComment()));
candidates.emplace_back(filterString(candidate.textWithComment("")));
} catch (const std::invalid_argument &e) {
size = static_cast<int>(candidates.size());
break;
@ -96,7 +96,7 @@ public:
} else {
size = list->size();
for (int i = 0; i < size; i++) {
candidates.emplace_back(filterString(list->candidate(i).textWithComment()));
candidates.emplace_back(filterString(list->candidate(i).textWithComment("")));
}
}
}

2
plugin/thai/licenses/libraries/fcitx5-libthai.json
View File

@ -1,6 +1,6 @@
{
"uniqueId": "fcitx/fcitx5-libthai",
"artifactVersion": "5.1.8",
"artifactVersion": "5.1.7",
"description": "Thai Wrapper for Fcitx",
"name": "fcitx/fcitx5-libthai",
"website": "https://github.com/fcitx/fcitx5-libthai",

2
plugin/thai/src/main/cpp/CMakeLists.txt
View File

@ -23,5 +23,7 @@ set_target_properties(Thai_static PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${PREBUILT_DIR}/libthai/${ANDROID_ABI}/include"
)
option(ENABLE_TEST "" OFF)
option(ENABLE_COVERAGE "" OFF)
set(THAI_TARGET Thai_static)
add_subdirectory(fcitx5-libthai)

2
plugin/thai/src/main/cpp/fcitx5-libthai

@ -1 +1 @@
Subproject commit 9f219d3998ce768551d98f513f243c2e01260296
Subproject commit 334b2a972245eaa412cd5c6c7c52c6edf7fd520f