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

Repo // Clear calligrapher together on resetInputHandler() (#210)

This commit is contained in:
ShikiSuen 2022-10-27 19:00:30 +08:00
parent 7c4f141286
commit ba3e1a99a5
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Modules/InputHandler_Core.swift
View File

@ -22,7 +22,9 @@ public protocol InputHandlerProtocol {
var currentUOM: vChewingLM.LMUserOverride { get set } var currentUOM: vChewingLM.LMUserOverride { get set }
var delegate: InputHandlerDelegate? { get set } var delegate: InputHandlerDelegate? { get set }
var composer: Tekkon.Composer { get set } var composer: Tekkon.Composer { get set }
var isComposerUsingPinyin: Bool { get }
func clear() func clear()
func clearComposerAndCalligrapher()
func ensureKeyboardParser() func ensureKeyboardParser()
func handleEvent(_ event: NSEvent) -> Bool func handleEvent(_ event: NSEvent) -> Bool
func generateStateOfInputting() -> IMEStateProtocol func generateStateOfInputting() -> IMEStateProtocol
@ -82,9 +84,8 @@ public class InputHandler: InputHandlerProtocol {
} }
public func clear() { public func clear() {
composer.clear() clearComposerAndCalligrapher()
compositor.clear() compositor.clear()
calligrapher.removeAll()
} }
// MARK: - Functions dealing with Megrez. // MARK: - Functions dealing with Megrez.
@ -367,8 +368,11 @@ public class InputHandler: InputHandlerProtocol {
composer.phonabetCombinationCorrectionEnabled = prefs.autoCorrectReadingCombination composer.phonabetCombinationCorrectionEnabled = prefs.autoCorrectReadingCombination
} }
func clearComposerAndCalligrapher() { public var isComposerUsingPinyin: Bool { composer.parser.rawValue >= 100 }
_ = prefs.cassetteEnabled ? calligrapher.removeAll() : composer.clear()
public func clearComposerAndCalligrapher() {
calligrapher.removeAll()
composer.clear()
} }
func letComposerAndCalligrapherDoBackSpace() { func letComposerAndCalligrapherDoBackSpace() {

2
Source/Modules/SessionCtl_Core.swift
View File

@ -169,7 +169,7 @@ extension SessionCtl {
public func resetInputHandler() { public func resetInputHandler() {
// 過濾掉尚未完成拼寫的注音。 // 過濾掉尚未完成拼寫的注音。
if state.type == .ofInputting, PrefMgr.shared.trimUnfinishedReadingsOnCommit { if state.type == .ofInputting, PrefMgr.shared.trimUnfinishedReadingsOnCommit {
inputHandler.composer.clear() inputHandler.clearComposerAndCalligrapher()
switchState(inputHandler.generateStateOfInputting()) switchState(inputHandler.generateStateOfInputting())
} }
// 威注音不再在這裡對 IMKTextInput 客體黑名單當中的應用做資安措施。 // 威注音不再在這裡對 IMKTextInput 客體黑名單當中的應用做資安措施。

2
Source/Modules/SessionCtl_HandleEvent.swift
View File

@ -117,7 +117,7 @@ extension SessionCtl {
} }
// 在啟用注音排列而非拼音輸入的情況下，強制將當前鍵盤佈局翻譯為美規鍵盤。 // 在啟用注音排列而非拼音輸入的情況下，強制將當前鍵盤佈局翻譯為美規鍵盤。
if inputHandler.composer.parser.rawValue < 100 || IMKHelper.isDynamicBasicKeyboardLayoutEnabled { if !inputHandler.isComposerUsingPinyin || IMKHelper.isDynamicBasicKeyboardLayoutEnabled {
eventToDeal = eventToDeal.inAppleABCStaticForm eventToDeal = eventToDeal.inAppleABCStaticForm
} }