Skip to content

Play your own Switch games on iPhone/iPad — one-click macOS app, no terminal. | 把 Switch 游戏装进 iPhone:图形界面一键构建,不用命令行。Bring your own game.

Hide the console pointer after about 1.5 seconds idle

v0lumehi4f76b4ac10bc
diff --git a/frontend/Sources/NSPortBuilder/ConsolePointer.swift b/frontend/Sources/NSPortBuilder/ConsolePointer.swift
index a89505d3..8df9d6d1 100644
--- a/frontend/Sources/NSPortBuilder/ConsolePointer.swift
+++ b/frontend/Sources/NSPortBuilder/ConsolePointer.swift
@@ -5,7 +5,8 @@ import AppKit
/// NSCursor.hide the launcher has outstanding, so hide and unhide stay balanced.
struct PointerIdle: Equatable {
enum Step { case none, hide, show }
- var idleSeconds: TimeInterval = 3
+ /// The timer looks every `ConsolePointer.pollSeconds`, so the pointer is gone 1.25 to 1.5 seconds after the last movement.
+ var idleSeconds: TimeInterval = 1.25
private(set) var hidden = false
private var lastLocation: CGPoint?
private var lastActivity: TimeInterval = 0
@@ -31,9 +32,10 @@ struct PointerIdle: Equatable {
private mutating func show() -> Step { hidden = false; return .show }
}
-/// Hides the pointer over the console after a few idle seconds. It watches the pointer position on a short timer, so it needs
+/// Hides the pointer over the console after about a second and a half of idle time. It watches the pointer position on a short timer, so it needs
/// no tracking area or mouse-moved events from the window.
@MainActor final class ConsolePointer {
+ static let pollSeconds: TimeInterval = 0.25
private var idle = PointerIdle()
private var timer: Timer?
private var monitor: Any?
@@ -49,7 +51,7 @@ struct PointerIdle: Equatable {
func start() {
guard timer == nil else { return }
- timer = Timer.scheduledTimer(withTimeInterval: 0.25, repeats: true) { [weak self] _ in
+ timer = Timer.scheduledTimer(withTimeInterval: Self.pollSeconds, repeats: true) { [weak self] _ in
MainActor.assumeIsolated { self?.look() }
}
monitor = NSEvent.addLocalMonitorForEvents(matching: [.leftMouseDown, .rightMouseDown, .otherMouseDown, .scrollWheel]) { [weak self] event in
diff --git a/frontend/Tests/NSPortBuilderTests/ConsolePointerTests.swift b/frontend/Tests/NSPortBuilderTests/ConsolePointerTests.swift
index 117b90dd..92019ae6 100644
--- a/frontend/Tests/NSPortBuilderTests/ConsolePointerTests.swift
+++ b/frontend/Tests/NSPortBuilderTests/ConsolePointerTests.swift
@@ -5,26 +5,41 @@ import XCTest
final class ConsolePointerTests: XCTestCase {
private let here = CGPoint(x: 10, y: 10)
- func testHidesAfterThreeIdleSecondsAndShowsOnMovement() {
+ func testHidesAfterAboutOneAndAHalfIdleSecondsAndShowsOnMovement() {
var idle = PointerIdle()
XCTAssertEqual(idle.tick(now: 0, location: here, buttonDown: false, over: true), .none)
- XCTAssertEqual(idle.tick(now: 2.9, location: here, buttonDown: false, over: true), .none)
- XCTAssertEqual(idle.tick(now: 3, location: here, buttonDown: false, over: true), .hide)
- XCTAssertEqual(idle.tick(now: 4, location: here, buttonDown: false, over: true), .none, "hidden once")
- XCTAssertEqual(idle.tick(now: 4.25, location: CGPoint(x: 11, y: 10), buttonDown: false, over: true), .show)
- XCTAssertEqual(idle.tick(now: 5, location: CGPoint(x: 11, y: 10), buttonDown: false, over: true), .none, "the idle time starts again")
- XCTAssertEqual(idle.tick(now: 7.25, location: CGPoint(x: 11, y: 10), buttonDown: false, over: true), .hide)
+ XCTAssertEqual(idle.tick(now: 1.0, location: here, buttonDown: false, over: true), .none)
+ XCTAssertEqual(idle.tick(now: 1.25, location: here, buttonDown: false, over: true), .hide)
+ XCTAssertEqual(idle.tick(now: 2, location: here, buttonDown: false, over: true), .none, "hidden once")
+ XCTAssertEqual(idle.tick(now: 2.25, location: CGPoint(x: 11, y: 10), buttonDown: false, over: true), .show)
+ XCTAssertEqual(idle.tick(now: 3, location: CGPoint(x: 11, y: 10), buttonDown: false, over: true), .none, "the idle time starts again")
+ XCTAssertEqual(idle.tick(now: 3.5, location: CGPoint(x: 11, y: 10), buttonDown: false, over: true), .hide)
+ }
+
+ func testTheRealDelayIsNeverMoreThanOneAndAHalfSeconds() {
+ XCTAssertEqual(PointerIdle().idleSeconds, 1.25)
+ XCTAssertLessThanOrEqual(PointerIdle().idleSeconds + ConsolePointer.pollSeconds, 1.5)
+ var idle = PointerIdle()
+ var now = 0.0
+ _ = idle.tick(now: now, location: here, buttonDown: false, over: true)
+ var step = PointerIdle.Step.none
+ while step == .none && now < 10 {
+ now += ConsolePointer.pollSeconds
+ step = idle.tick(now: now, location: here, buttonDown: false, over: true)
+ }
+ XCTAssertEqual(step, .hide)
+ XCTAssertLessThanOrEqual(now, 1.5)
}
func testAClickOrAScrollShowsItAndRestartsTheWait() {
var idle = PointerIdle()
_ = idle.tick(now: 0, location: here, buttonDown: false, over: true)
- XCTAssertEqual(idle.tick(now: 3, location: here, buttonDown: false, over: true), .hide)
+ XCTAssertEqual(idle.tick(now: 1.5, location: here, buttonDown: false, over: true), .hide)
XCTAssertEqual(idle.activity(now: 4), .show)
XCTAssertEqual(idle.activity(now: 4.1), .none, "nothing to show")
- XCTAssertEqual(idle.tick(now: 6, location: here, buttonDown: false, over: true), .none)
- XCTAssertEqual(idle.tick(now: 7.1, location: here, buttonDown: false, over: true), .hide)
- XCTAssertEqual(idle.tick(now: 7.25, location: here, buttonDown: true, over: true), .show, "a held button is activity")
+ XCTAssertEqual(idle.tick(now: 5, location: here, buttonDown: false, over: true), .none)
+ XCTAssertEqual(idle.tick(now: 5.5, location: here, buttonDown: false, over: true), .hide)
+ XCTAssertEqual(idle.tick(now: 5.75, location: here, buttonDown: true, over: true), .show, "a held button is activity")
}
func testStaysVisibleOutsideTheWindowAndComesBackWhenItLeaves() {
@@ -39,7 +54,7 @@ final class ConsolePointerTests: XCTestCase {
var idle = PointerIdle()
XCTAssertEqual(idle.reset(), .none)
_ = idle.tick(now: 0, location: here, buttonDown: false, over: true)
- _ = idle.tick(now: 3, location: here, buttonDown: false, over: true)
+ _ = idle.tick(now: 1.5, location: here, buttonDown: false, over: true)
XCTAssertEqual(idle.reset(), .show)
XCTAssertEqual(idle.reset(), .none)
}