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

SessionCtl // Change how updateVerticalTypingStatus() gets triggered.

This commit is contained in:
ShikiSuen 2022-12-14 14:45:33 +08:00
parent 00ce1f23ce
commit b64910d7a5
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Modules/SessionCtl_Core.swift
View File

@ -106,14 +106,12 @@ public class SessionCtl: IMKInputController {
isVerticalTyping = false isVerticalTyping = false
return return
} }
DispatchQueue.main.async { var textFrame = NSRect.seniorTheBeast
var textFrame = NSRect.seniorTheBeast let attributes: [AnyHashable: Any]? = client.attributes(
let attributes: [AnyHashable: Any]? = client.attributes( forCharacterIndex: 0, lineHeightRectangle: &textFrame
forCharacterIndex: 0, lineHeightRectangle: &textFrame )
) let result = (attributes?["IMKTextOrientation"] as? NSNumber)?.intValue == 0 || false
let result = (attributes?["IMKTextOrientation"] as? NSNumber)?.intValue == 0 || false isVerticalTyping = result
self.isVerticalTyping = result
}
} }
/// InputMode 需要在每次出現內容變更的時候都連帶重設組字器與各項語言模組， /// InputMode 需要在每次出現內容變更的時候都連帶重設組字器與各項語言模組，
@ -213,7 +211,6 @@ extension SessionCtl {
public override func activateServer(_ sender: Any!) { public override func activateServer(_ sender: Any!) {
_ = sender // 防止格式整理工具毀掉與此對應的參數。 _ = sender // 防止格式整理工具毀掉與此對應的參數。
DispatchQueue.main.async { [self] in DispatchQueue.main.async { [self] in
defer { updateVerticalTypingStatus() }
if let senderBundleID: String = (sender as? IMKTextInput)?.bundleIdentifier() { if let senderBundleID: String = (sender as? IMKTextInput)?.bundleIdentifier() {
vCLog("activateServer(\(senderBundleID))") vCLog("activateServer(\(senderBundleID))")
isServingIMEItself = Bundle.main.bundleIdentifier == senderBundleID isServingIMEItself = Bundle.main.bundleIdentifier == senderBundleID

1
Source/Modules/SessionCtl_HandleDisplay.swift
View File

@ -73,6 +73,7 @@ extension SessionCtl {
public func showCandidates() { public func showCandidates() {
guard let client = client() else { return } guard let client = client() else { return }
updateVerticalTypingStatus()
state.isVerticalCandidateWindow = (isVerticalTyping || !PrefMgr.shared.useHorizontalCandidateList) state.isVerticalCandidateWindow = (isVerticalTyping || !PrefMgr.shared.useHorizontalCandidateList)
/// 無論是田所選字窗還是 IMK 選字窗，在這裡都有必要重新初期化。 /// 無論是田所選字窗還是 IMK 選字窗，在這裡都有必要重新初期化。

1
Source/Modules/SessionCtl_HandleEvent.swift
View File

@ -119,6 +119,7 @@ extension SessionCtl {
// 如果是方向鍵輸入的話，就想辦法帶上標記資訊、來說明當前是縱排還是橫排。 // 如果是方向鍵輸入的話，就想辦法帶上標記資訊、來說明當前是縱排還是橫排。
if event.isUp || event.isDown || event.isLeft || event.isRight { if event.isUp || event.isDown || event.isLeft || event.isRight {
updateVerticalTypingStatus() // 檢查當前環境是否是縱排輸入。
eventToDeal = event.reinitiate(charactersIgnoringModifiers: isVerticalTyping ? "Vertical" : "Horizontal") ?? event eventToDeal = event.reinitiate(charactersIgnoringModifiers: isVerticalTyping ? "Vertical" : "Horizontal") ?? event
} }