From 6b22f3d6f1870b75f3a38cf65b6b66b19ae366a2 Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Wed, 28 Jun 2023 09:53:58 +0800 Subject: [PATCH] IMEState // Change marking style for .ofCandidates(). --- Source/Modules/IMEState.swift | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Source/Modules/IMEState.swift b/Source/Modules/IMEState.swift index 897b0cd0..45fa997b 100644 --- a/Source/Modules/IMEState.swift +++ b/Source/Modules/IMEState.swift @@ -196,12 +196,14 @@ public extension IMEState { func attributedString(for session: IMKInputController) -> NSAttributedString { switch type { case .ofMarking: return data.attributedStringMarking(for: session) + case .ofCandidates where cursor != marker: return data.attributedStringMarking(for: session) + case .ofCandidates where cursor == marker: break case .ofAssociates: return data.attributedStringPlaceholder(for: session) - case .ofSymbolTable: - guard !displayedText.isEmpty else { return data.attributedStringPlaceholder(for: session) } - return data.attributedStringNormal(for: session) - default: return data.attributedStringNormal(for: session) + case .ofSymbolTable where displayedText.isEmpty: return data.attributedStringPlaceholder(for: session) + case .ofSymbolTable where !displayedText.isEmpty: break + default: break } + return data.attributedStringNormal(for: session) } /// 該參數僅用作輔助判斷。在 InputHandler 內使用的話，必須再檢查 !compositor.isEmpty。