Merge branch 'fcitx:master' into master

Author: mokapsing

CMakeLists.txt

@@ -10,7 +10,7 @@ include(ECMSetupVersion)
 include(ECMUninstallTarget)
 
 find_package(Gettext REQUIRED)
-find_package(Fcitx5Core 5.1.7 REQUIRED)
+find_package(Fcitx5Core 5.1.9 REQUIRED)
 find_package(Fcitx5Module REQUIRED COMPONENTS Notifications)
 find_package(PkgConfig REQUIRED)
 

src/rimecandidate.cpp

@@ -19,13 +19,10 @@ RimeCandidateWord::RimeCandidateWord(RimeEngine *engine,
                                      const RimeCandidate &candidate, KeySym sym,
                                      int idx)
     : CandidateWord(), engine_(engine), sym_(sym), idx_(idx) {
-    Text text;
-    text.append(std::string(candidate.text));
-    if (candidate.comment && strlen(candidate.comment)) {
-        text.append(" ");
-        text.append(std::string(candidate.comment));
+    setText(Text{candidate.text});
+    if (candidate.comment && candidate.comment[0]) {
+        setComment(Text{candidate.comment});
     }
-    setText(text);
 }
 
 void RimeCandidateWord::select(InputContext *inputContext) const {
@@ -45,13 +42,10 @@ RimeGlobalCandidateWord::RimeGlobalCandidateWord(RimeEngine *engine,
                                                  const RimeCandidate &candidate,
                                                  int idx)
     : CandidateWord(), engine_(engine), idx_(idx) {
-    Text text;
-    text.append(std::string(candidate.text));
-    if (candidate.comment && strlen(candidate.comment)) {
-        text.append(" ");
-        text.append(std::string(candidate.comment));
+    setText(Text{candidate.text});
+    if (candidate.comment && candidate.comment[0]) {
+        setComment(Text{candidate.comment});
     }
-    setText(text);
 }
 
 void RimeGlobalCandidateWord::select(InputContext *inputContext) const {

src/rimeengine.h

@@ -56,10 +56,13 @@ FCITX_CONFIGURATION(
         isAndroid() ? PreeditMode::No : PreeditMode::ComposingText};
     Option<SharedStatePolicy> sharedStatePolicy{
         this, "InputState", _("Shared Input State"), SharedStatePolicy::All};
+    // On Linux only cursor position is available so this pins candidate window
+    // while typing. On macOS any position within embedded preedit is available
+    // so this is unnecessary. On Android there is no candidate window yet.
     Option<bool> preeditCursorPositionAtBeginning{
         this, "PreeditCursorPositionAtBeginning",
         _("Fix embedded preedit cursor at the beginning of the preedit"),
-        !isAndroid()};
+        !isAndroid() && !isApple()};
     Option<bool> commitWhenDeactivate{
         this, "Commit when deactivate",
         _("Commit current text when deactivating"), true};