Uses exact UTF32 code point count.

openvanilla · Dec 26, 2023 · 51bf2e6 · 51bf2e6
1 parent 14fe216
commit 51bf2e6
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/McBopomofo.cpp b/src/McBopomofo.cpp
@@ -747,13 +747,9 @@ fcitx::CandidateLayoutHint McBopomofoEngine::getCandidateLayoutHint() const {
   if (choosingCandidate != nullptr) {
     auto candidates = choosingCandidate->candidates;
     for (auto candidate : candidates) {
-      if (candidate.value.length() > 8) {
-        return fcitx::CandidateLayoutHint::Vertical;
-      }
-    }
-    if (candidates.size() > 0) {
-      auto firstCandidate = candidates[0];
-      if (firstCandidate.value.length() > 8) {
+      std::wstring_convert<std::codecvt_utf8<char32_t>, char32_t> conv;
+      auto u32 = conv.from_bytes(candidate.value);
+      if (u32.size() > 8) {
         return fcitx::CandidateLayoutHint::Vertical;
       }
     }