floraachy
/
vChewing-macOS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ctlIME // Simplify switches of kanji conversion modes.

This commit is contained in:
ShikiSuen 2022-06-15 12:23:41 +08:00
parent 81e157ef6e
commit 38f85e4915
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Modules/IMEModules/ctlInputMethod.swift
View File

@ -231,18 +231,13 @@ extension ctlInputMethod {
private func commit(text: String) { private func commit(text: String) {
func kanjiConversionIfRequired(_ text: String) -> String { func kanjiConversionIfRequired(_ text: String) -> String {
if keyHandler.inputMode == InputMode.imeModeCHT { if keyHandler.inputMode == InputMode.imeModeCHT {
if !mgrPrefs.chineseConversionEnabled, mgrPrefs.shiftJISShinjitaiOutputEnabled { switch (mgrPrefs.chineseConversionEnabled, mgrPrefs.shiftJISShinjitaiOutputEnabled) {
return vChewingKanjiConverter.cnvTradToJIS(text) case (false, true): return vChewingKanjiConverter.cnvTradToJIS(text)
case (true, false): return vChewingKanjiConverter.cnvTradToKangXi(text)
// 本來這兩個開關不該同時開啟的，但萬一被開啟了的話就這樣處理：
case (true, true): return vChewingKanjiConverter.cnvTradToJIS(text)
case (false, false): return text
} }
if mgrPrefs.chineseConversionEnabled, !mgrPrefs.shiftJISShinjitaiOutputEnabled {
return vChewingKanjiConverter.cnvTradToKangXi(text)
}
// 本來這兩個開關不該同時開啟的，但萬一被開啟了的話就這樣處理：
if mgrPrefs.chineseConversionEnabled, mgrPrefs.shiftJISShinjitaiOutputEnabled {
return vChewingKanjiConverter.cnvTradToJIS(text)
}
// if (!mgrPrefs.chineseConversionEnabled && !mgrPrefs.shiftJISShinjitaiOutputEnabled) || (keyHandler.inputMode != InputMode.imeModeCHT);
return text
} }
return text return text
} }