Fixed caps lock symbol ghosting

Author: Bohdan

LanguageFlag/Application/AppDelegate.swift

@@ -21,8 +21,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     // MARK: - Initialization
     override init() {
         self.screenManager = ScreenManager()
-        self.notificationManager = NotificationManager()
         self.capsLockManager = CapsLockManager()
+        self.notificationManager = NotificationManager(capsLockManager: capsLockManager)
 
         super.init()
     }

LanguageFlag/Helpers/CapsLockManager.swift

@@ -7,6 +7,7 @@ class CapsLockManager {
     private(set) var isCapsLockEnabled: Bool = false
     private var globalEventMonitor: Any?
     private var localEventMonitor: Any?
+    private var debounceTask: DispatchWorkItem?
 
     // MARK: - Init
     init() {
@@ -47,14 +48,24 @@ extension CapsLockManager {
         }
     }
 
-    /// Handles Caps Lock state changes.
+    /// Handles Caps Lock state changes using a debounce mechanism to ignore
+    /// fast, transient layout-switching toggles created by macOS.
     private func handleCapsLockStateChange(event: NSEvent) {
-        let capsLockEnabled = event.modifierFlags.contains(.capsLock)
+        debounceTask?.cancel()
 
-        if isCapsLockEnabled != capsLockEnabled {
-            isCapsLockEnabled = capsLockEnabled
-            notifyCapsLockStateChanged(newCapsLockEnabled: capsLockEnabled)
+        let task = DispatchWorkItem { [weak self] in
+            guard let self else { return }
+
+            let capsLockEnabled = CGEventSource.flagsState(.combinedSessionState).contains(.maskAlphaShift)
+
+            if isCapsLockEnabled != capsLockEnabled {
+                isCapsLockEnabled = capsLockEnabled
+                notifyCapsLockStateChanged(newCapsLockEnabled: capsLockEnabled)
+            }
         }
+        
+        debounceTask = task
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.08, execute: task)
     }
 
     /// Notifies observers about the Caps Lock state change.

LanguageFlag/Helpers/NotificationManager.swift

@@ -4,8 +4,11 @@ import Combine
 
 class NotificationManager {
 
+    private let capsLockManager: CapsLockManager
+
     // MARK: - Init
-    init() {
+    init(capsLockManager: CapsLockManager) {
+        self.capsLockManager = capsLockManager
         setupObservers()
     }
 }
@@ -27,7 +30,7 @@ extension NotificationManager {
     @objc
     private func handleInputSourceChange() {
         let currentLayout = TISCopyCurrentKeyboardInputSource().takeUnretainedValue()
-        let isCapsLockOn = CGEventSource.flagsState(.combinedSessionState).contains(.maskAlphaShift)
+        let isCapsLockOn = capsLockManager.isCapsLockEnabled
         let model = KeyboardLayoutNotification(keyboardLayout: currentLayout.name,
                                                isCapsLockEnabled: isCapsLockOn,
                                                iconRef: currentLayout.iconRef)