From 36fe4fced350807ca31417b807f81272b300e429 Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Mon, 30 Oct 2023 11:56:42 +0800 Subject: [PATCH] SessionCtl // Deprecate .isCapsLocked(). --- .../Sources/MainAssembly/SessionCtl_Core.swift | 3 --- .../Sources/MainAssembly/SessionCtl_HandleEvent.swift | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionCtl_Core.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionCtl_Core.swift index 16510860..f97d2386 100644 --- a/Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionCtl_Core.swift +++ b/Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionCtl_Core.swift @@ -79,9 +79,6 @@ public class SessionCtl: IMKInputController { // MARK: - - /// 當前 Caps Lock 按鍵是否被摁下。 - public static var isCapsLocked: Bool { NSEvent.keyModifierFlags.contains(.capsLock) } - /// 當前這個 SessionCtl 副本是否處於英數輸入模式。 public var isASCIIMode: Bool { get { diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionCtl_HandleEvent.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionCtl_HandleEvent.swift index af2cc70a..59a38f9c 100644 --- a/Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionCtl_HandleEvent.swift +++ b/Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionCtl_HandleEvent.swift @@ -195,7 +195,7 @@ public extension SessionCtl { ? NSLocalizedString("Alphanumerical Input Mode", comment: "") + "\n" + status : NSLocalizedString("Chinese Input Mode", comment: "") + "\n" + status ) - if PrefMgr.shared.shiftEisuToggleOffTogetherWithCapsLock, oldValue, !newValue, Self.isCapsLocked { + if PrefMgr.shared.shiftEisuToggleOffTogetherWithCapsLock, oldValue, !newValue, CapsLockToggler.isOn { CapsLockToggler.turnOff() } }