From bc428f2b045abbdd44343af4625e088b7ddb20f9 Mon Sep 17 00:00:00 2001
From: ShikiSuen <shikisuen@outlook.com>
Date: Wed, 22 Jun 2022 12:07:51 +0800
Subject: [PATCH] ctlCandUniv. // Let candidates respect Chinese conversion
 settings.

---
 Source/UI/CandidateUI/ctlCandidateUniversal.swift | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/Source/UI/CandidateUI/ctlCandidateUniversal.swift b/Source/UI/CandidateUI/ctlCandidateUniversal.swift
index c421f8d3..967bf988 100644
--- a/Source/UI/CandidateUI/ctlCandidateUniversal.swift
+++ b/Source/UI/CandidateUI/ctlCandidateUniversal.swift
@@ -74,6 +74,11 @@ private class vwrCandidateUniversal: NSView {
 
   @objc(setKeyLabels:displayedCandidates:)
   func set(keyLabels labels: [String], displayedCandidates candidates: [String]) {
+    let candidates = candidates.map { theCandidate -> String in
+      let theConverted = IME.kanjiConversionIfRequired(theCandidate)
+      return (theCandidate == theConverted) ? theCandidate : "\(theConverted)(\(theCandidate))"
+    }
+
     let count = min(labels.count, candidates.count)
     keyLabels = Array(labels[0..<count])
     displayedCandidates = Array(candidates[0..<count])
@@ -209,7 +214,9 @@ private class vwrCandidateUniversal: NSView {
                 }
               case InputMode.imeModeCHT:
                 if #available(macOS 12.0, *) {
-                  activeCandidateAttr[.languageIdentifier] = "zh-Hant" as AnyObject
+                  activeCandidateAttr[.languageIdentifier] =
+                    (mgrPrefs.shiftJISShinjitaiOutputEnabled || mgrPrefs.chineseConversionEnabled)
+                    ? "ja" as AnyObject : "zh-Hant" as AnyObject
                 }
               default:
                 break
@@ -279,7 +286,9 @@ private class vwrCandidateUniversal: NSView {
                 }
               case InputMode.imeModeCHT:
                 if #available(macOS 12.0, *) {
-                  activeCandidateAttr[.languageIdentifier] = "zh-Hant" as AnyObject
+                  activeCandidateAttr[.languageIdentifier] =
+                    (mgrPrefs.shiftJISShinjitaiOutputEnabled || mgrPrefs.chineseConversionEnabled)
+                    ? "ja" as AnyObject : "zh-Hant" as AnyObject
                 }
               default:
                 break