Split trigger-zone into separate untrigger-zone for click restore

Sources/SketchyBarToggle/main.swift

@@ -44,6 +44,7 @@ let controller = SketchyBarController()
 let stateMachine = BarStateMachine(
     controller: controller,
     triggerZone: config.triggerZone,
+    untriggerZone: config.untriggerZone,
     menuBarHeight: config.menuBarHeight,
     debounceInterval: config.debounce
 )
@@ -72,15 +73,15 @@ if config.debug || ProcessInfo.processInfo.environment["SKETCHYBAR_TOGGLE_DEBUG"
         let line = "\(ISO8601DateFormatter().string(from: Date())) \(msg)\n"
         debugLogFile?.write(line.data(using: .utf8) ?? Data())
     }
-    debugLog?("started with trigger=\(Int(config.triggerZone)) menuBar=\(Int(config.menuBarHeight)) debounce=\(Int(config.debounce * 1000))ms")
+    debugLog?("started with trigger=\(Int(config.triggerZone)) untrigger=\(Int(config.untriggerZone)) menuBar=\(Int(config.menuBarHeight)) debounce=\(Int(config.debounce * 1000))ms")
 } else {
     debugLog = nil
 }
 
 let monitor = EventTapMonitor(stateMachine: stateMachine, debugLog: debugLog)
 monitor.start()
 
-print("sketchybar-toggle v\(version) running (trigger: \(Int(config.triggerZone))px, menu bar: \(Int(config.menuBarHeight))px, debounce: \(Int(config.debounce * 1000))ms)")
+print("sketchybar-toggle v\(version) running (trigger: \(Int(config.triggerZone))px, untrigger: \(Int(config.untriggerZone))px, menu bar: \(Int(config.menuBarHeight))px, debounce: \(Int(config.debounce * 1000))ms)")
 if config.debug { print("Debug logging to /tmp/sketchybar-toggle-debug.log") }
 print("Press Ctrl+C to stop.")
 
@@ -110,6 +111,7 @@ func printUsage() {
 
     Options:
       --trigger-zone <px>       Pixels from top of screen to trigger hide (default: 10)
+      --untrigger-zone <px>     Pixels from top a click must clear to restore the bar (default: 30)
       --menu-bar-height <px>    Pixels from top defining menu bar zone (default: 50)
       --debounce <ms>           Debounce delay in milliseconds (default: 150)
       --check-permissions       Check permissions (no longer needed in v0.4.0+)

Sources/SketchyBarToggleCore/Config.swift

@@ -2,6 +2,7 @@ import Foundation
 
 public struct Config: Equatable {
     public var triggerZone: CGFloat = 10
+    public var untriggerZone: CGFloat = 30
     public var menuBarHeight: CGFloat = 50
     public var debounce: TimeInterval = 0.15
     public var checkPermissions = false
@@ -29,6 +30,11 @@ public func parseArguments(_ args: [String]) throws -> Config {
             if i < args.count, let val = Double(args[i]) {
                 config.triggerZone = CGFloat(val)
             }
+        case "--untrigger-zone":
+            i += 1
+            if i < args.count, let val = Double(args[i]) {
+                config.untriggerZone = CGFloat(val)
+            }
         case "--menu-bar-height":
             i += 1
             if i < args.count, let val = Double(args[i]) {

Sources/SketchyBarToggleCore/StateMachine.swift

@@ -11,6 +11,7 @@ public final class BarStateMachine {
     public private(set) var state: BarState = .visible
 
     public let triggerZone: CGFloat
+    public let untriggerZone: CGFloat
     public let menuBarHeight: CGFloat
     public let debounceInterval: TimeInterval
 
@@ -21,12 +22,14 @@ public final class BarStateMachine {
     public init(
         controller: BarController,
         triggerZone: CGFloat = 10,
+        untriggerZone: CGFloat = 30,
         menuBarHeight: CGFloat = 50,
         debounceInterval: TimeInterval = 0.15,
         timerQueue: DispatchQueue = .main
     ) {
         self.controller = controller
         self.triggerZone = triggerZone
+        self.untriggerZone = untriggerZone
         self.menuBarHeight = menuBarHeight
         self.debounceInterval = debounceInterval
         self.timerQueue = timerQueue
@@ -56,7 +59,7 @@ public final class BarStateMachine {
     /// If the click is outside the trigger zone, immediately restore SketchyBar
     /// so that window title bars near the top of the screen remain interactive.
     public func handleMouseClick(distanceFromTop: CGFloat) {
-        guard state == .hidden, distanceFromTop >= triggerZone else { return }
+        guard state == .hidden, distanceFromTop >= untriggerZone else { return }
         cancelDebounce()
         state = .visible
         controller.show()

Tests/SketchyBarToggleTests/ConfigTests.swift

@@ -6,6 +6,7 @@ final class ConfigTests: XCTestCase {
     func testDefaultConfig() throws {
         let config = try parseArguments([])
         XCTAssertEqual(config.triggerZone, 10)
+        XCTAssertEqual(config.untriggerZone, 30)
         XCTAssertEqual(config.menuBarHeight, 50)
         XCTAssertEqual(config.debounce, 0.15)
         XCTAssertFalse(config.checkPermissions)
@@ -24,6 +25,11 @@ final class ConfigTests: XCTestCase {
         XCTAssertEqual(config.menuBarHeight, 44)
     }
 
+    func testUntriggerZone() throws {
+        let config = try parseArguments(["--untrigger-zone", "25"])
+        XCTAssertEqual(config.untriggerZone, 25)
+    }
+
     func testDebounceConvertsMillisecondsToSeconds() throws {
         let config = try parseArguments(["--debounce", "300"])
         XCTAssertEqual(config.debounce, 0.3)

Tests/SketchyBarToggleTests/StateMachineTests.swift

@@ -247,27 +247,40 @@ final class StateMachineTests: XCTestCase {
 
     // MARK: - Click-to-restore behavior
 
-    func testClickInHiddenStateOutsideTriggerZoneRestoresBar() {
+    func testClickInHiddenStateOutsideUntriggerZoneRestoresBar() {
         let mock = MockBarController()
-        let sm = BarStateMachine(controller: mock, triggerZone: 10, menuBarHeight: 50)
+        let sm = BarStateMachine(controller: mock, triggerZone: 10, untriggerZone: 30, menuBarHeight: 50)
 
         sm.handleMousePosition(distanceFromTop: 5) // hide
         XCTAssertEqual(sm.state, .hidden)
         mock.reset()
 
-        sm.handleMouseClick(distanceFromTop: 30) // click in menu bar zone but outside trigger
+        sm.handleMouseClick(distanceFromTop: 40) // click below untrigger zone
         XCTAssertEqual(sm.state, .visible)
         XCTAssertEqual(mock.showCallCount, 1)
     }
 
-    func testClickInHiddenStateInsideTriggerZoneDoesNotRestore() {
+    func testClickInHiddenStateInsideUntriggerZoneDoesNotRestore() {
         let mock = MockBarController()
-        let sm = BarStateMachine(controller: mock, triggerZone: 10, menuBarHeight: 50)
+        let sm = BarStateMachine(controller: mock, triggerZone: 10, untriggerZone: 30, menuBarHeight: 50)
 
         sm.handleMousePosition(distanceFromTop: 5) // hide
         XCTAssertEqual(sm.state, .hidden)
 
-        sm.handleMouseClick(distanceFromTop: 5) // click still in trigger zone (using menu bar)
+        sm.handleMouseClick(distanceFromTop: 20) // click inside untrigger zone (menu bar area)
+        XCTAssertEqual(sm.state, .hidden)
+    }
+
+    func testClickBetweenTriggerAndUntriggerZoneDoesNotRestore() {
+        // Key split-threshold test: triggerZone=10, untriggerZone=30.
+        // A click at 15px is outside triggerZone but inside untriggerZone — should NOT restore.
+        let mock = MockBarController()
+        let sm = BarStateMachine(controller: mock, triggerZone: 10, untriggerZone: 30, menuBarHeight: 50)
+
+        sm.handleMousePosition(distanceFromTop: 5) // hide
+        XCTAssertEqual(sm.state, .hidden)
+
+        sm.handleMouseClick(distanceFromTop: 15) // between the two thresholds
         XCTAssertEqual(sm.state, .hidden)
     }
 
@@ -285,6 +298,7 @@ final class StateMachineTests: XCTestCase {
         let sm = BarStateMachine(
             controller: mock,
             triggerZone: 10,
+            untriggerZone: 30,
             menuBarHeight: 50,
             debounceInterval: 0.1
         )
@@ -300,7 +314,7 @@ final class StateMachineTests: XCTestCase {
 
     func testClickBelowMenuBarZoneRestoresBar() {
         let mock = MockBarController()
-        let sm = BarStateMachine(controller: mock, triggerZone: 10, menuBarHeight: 50)
+        let sm = BarStateMachine(controller: mock, triggerZone: 10, untriggerZone: 30, menuBarHeight: 50)
 
         sm.handleMousePosition(distanceFromTop: 5) // hide
         mock.reset()