Merge pull request #72 from fcitx/update_cskk

Update cskk version
fcitx · Dec 4, 2022 · 28230a8 · 28230a8
2 parents 5ddb185 + ce61ba1
commit 28230a8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml
@@ -13,5 +13,4 @@ jobs:
       - name: Run clang-format style check for C/C++ programs.
         uses: jidicula/[email protected]
         with:
-          clang-format-version: '11'
           check-path: ${{ matrix.path }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,8 +21,8 @@ find_package(PkgConfig REQUIRED)
 find_package(Fcitx5Core 5.0.6 REQUIRED)
 find_package(Fcitx5Utils 5.0.6 REQUIRED)
 
-# GITHUB_ACTION_BUILD_CSKK_VERSION=1.1.0
-pkg_check_modules(LIBCSKK REQUIRED IMPORTED_TARGET "cskk>=1.1")
+# GITHUB_ACTION_BUILD_CSKK_VERSION=2.0.0
+pkg_check_modules(LIBCSKK REQUIRED IMPORTED_TARGET "cskk>=2.0")
 
 option(ENABLE_QT "Enable Qt for GUI configuration" On)
 

diff --git a/org.fcitx.Fcitx5.Addon.Cskk.metainfo.xml.in b/org.fcitx.Fcitx5.Addon.Cskk.metainfo.xml.in
@@ -11,6 +11,7 @@
   <url type="bugtracker">https://github.com/naokiri/fcitx5-cskk/issues</url>
   <project_group>Fcitx</project_group>
   <releases>
+    <release version="1.1.0" date="2022-12-04"/>
     <release version="1.0.0" date="2022-11-04"/>
     <release version="0.8.2" date="2022-10-29"/>
     <release version="0.8.1" date="2022-10-15"/>

diff --git a/src/cskk.cpp b/src/cskk.cpp
@@ -556,6 +556,11 @@ FcitxCskkContext::formatPreedit(CskkStateInfoFfi *cskkStateInfoArray,
         mainCursorIdx += strlen(registerStateInfo.okuri);
         mainContent.append(registerStateInfo.okuri, TextFormatFlag::DontCommit);
       }
+      if (registerStateInfo.postfix) {
+        mainCursorIdx += strlen(registerStateInfo.postfix);
+        mainContent.append(registerStateInfo.postfix,
+                           TextFormatFlag::DontCommit);
+      }
       mainCursorIdx += strlen("【");
       mainContent.append("【", TextFormatFlag::DontCommit);
     } break;