Skip to content

Feat: per-window layout memory & Accessibility startup gate #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dranik-by wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Feat: per-window layout memory & Accessibility startup gate #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ec44d3
Feat: persist app keyboard memory
Aug 18, 2026
5629bbf
add title default
Aug 19, 2026
4778dbd
feat: per-window layout memory and Accessibility startup gate
Aug 27, 2026
40e6e31
fix build macos
Aug 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions Input Source Pro.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@
D56A7CFC28A4D5C0002F356A /* AXSwift+Browser.swift in Sources */ = {isa = PBXBuildFile; fileRef = D56A7CFB28A4D5C0002F356A /* AXSwift+Browser.swift */; };
D57334262A84B40B00C8438F /* IconMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = D57334252A84B40B00C8438F /* IconMap.swift */; };
D579258C2A1AB0A4003B83EA /* NSRunningApplication+WindowInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = D579258B2A1AB0A4003B83EA /* NSRunningApplication+WindowInfo.swift */; };
D6A100102F2700000000A001 /* CGWindowIdentity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A100112F2700000000A001 /* CGWindowIdentity.swift */; };
D57925902A1AB1DA003B83EA /* NSRunningApplication+FloatingApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = D579258F2A1AB1DA003B83EA /* NSRunningApplication+FloatingApp.swift */; };
D57925922A1ACA0B003B83EA /* AppKind.swift in Sources */ = {isa = PBXBuildFile; fileRef = D57925912A1ACA0B003B83EA /* AppKind.swift */; };
D58168CA28943A5400E84058 /* Indicator-Near-Cursor-Demo-Dark.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = D58168C828943A5300E84058 /* Indicator-Near-Cursor-Demo-Dark.mp4 */; };
Expand All @@ -153,6 +154,9 @@
D58168D528957D5500E84058 /* QuestionMark.swift in Sources */ = {isa = PBXBuildFile; fileRef = D58168D428957D5500E84058 /* QuestionMark.swift */; };
D58C184428A6ABBC00F52845 /* NSRunningApplication+FocusedElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = D58C184328A6ABBC00F52845 /* NSRunningApplication+FocusedElement.swift */; };
D58C184628A6B2DE00F52845 /* ISPLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = D58C184528A6B2DE00F52845 /* ISPLogger.swift */; };
D6A100112F2000000000A001 /* ISPFileLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A100012F2000000000A001 /* ISPFileLog.swift */; };
D6A100122F2000000000A002 /* LaunchpadOverlayDetector.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A100022F2000000000A002 /* LaunchpadOverlayDetector.swift */; };
D6A100132F2000000000A003 /* SystemChrome.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A100032F2000000000A003 /* SystemChrome.swift */; };
D58C184828A808F000F52845 /* KeyboardRestoreStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = D58C184728A808F000F52845 /* KeyboardRestoreStrategy.swift */; };
D5CC44942A33F143007FF839 /* TroubleshootingSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5CC44932A33F143007FF839 /* TroubleshootingSettingsView.swift */; };
D5CC44962A33F485007FF839 /* EnhancedModeRequiredBadge.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5CC44952A33F485007FF839 /* EnhancedModeRequiredBadge.swift */; };
Expand All @@ -176,6 +180,7 @@
D60000722F20000000000072 /* AppURLActionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D60000712F20000000000071 /* AppURLActionTests.swift */; };
D60000822F20000000000082 /* URLActivationSuppressionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D60000812F20000000000081 /* URLActivationSuppressionTests.swift */; };
D60001022F20000000000102 /* AppKindComparisonTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D60001012F20000000000101 /* AppKindComparisonTests.swift */; };
D60001042F20000000000104 /* AppKeyboardCacheMultiInstanceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D60001032F20000000000103 /* AppKeyboardCacheMultiInstanceTests.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -331,6 +336,7 @@
D56A7CFB28A4D5C0002F356A /* AXSwift+Browser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AXSwift+Browser.swift"; sourceTree = "<group>"; };
D57334252A84B40B00C8438F /* IconMap.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IconMap.swift; sourceTree = "<group>"; };
D579258B2A1AB0A4003B83EA /* NSRunningApplication+WindowInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSRunningApplication+WindowInfo.swift"; sourceTree = "<group>"; };
D6A100112F2700000000A001 /* CGWindowIdentity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CGWindowIdentity.swift; sourceTree = "<group>"; };
D579258F2A1AB1DA003B83EA /* NSRunningApplication+FloatingApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSRunningApplication+FloatingApp.swift"; sourceTree = "<group>"; };
D57925912A1ACA0B003B83EA /* AppKind.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppKind.swift; sourceTree = "<group>"; };
D58168C828943A5300E84058 /* Indicator-Near-Cursor-Demo-Dark.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Indicator-Near-Cursor-Demo-Dark.mp4"; sourceTree = "<group>"; };
Expand All @@ -342,6 +348,9 @@
D58168D428957D5500E84058 /* QuestionMark.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuestionMark.swift; sourceTree = "<group>"; };
D58C184328A6ABBC00F52845 /* NSRunningApplication+FocusedElement.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSRunningApplication+FocusedElement.swift"; sourceTree = "<group>"; };
D58C184528A6B2DE00F52845 /* ISPLogger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ISPLogger.swift; sourceTree = "<group>"; };
D6A100012F2000000000A001 /* ISPFileLog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ISPFileLog.swift; sourceTree = "<group>"; };
D6A100022F2000000000A002 /* LaunchpadOverlayDetector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LaunchpadOverlayDetector.swift; sourceTree = "<group>"; };
D6A100032F2000000000A003 /* SystemChrome.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SystemChrome.swift; sourceTree = "<group>"; };
D58C184728A808F000F52845 /* KeyboardRestoreStrategy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardRestoreStrategy.swift; sourceTree = "<group>"; };
D5CC44932A33F143007FF839 /* TroubleshootingSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TroubleshootingSettingsView.swift; sourceTree = "<group>"; };
D5CC44952A33F485007FF839 /* EnhancedModeRequiredBadge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnhancedModeRequiredBadge.swift; sourceTree = "<group>"; };
Expand All @@ -367,6 +376,7 @@
D60000712F20000000000071 /* AppURLActionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppURLActionTests.swift; sourceTree = "<group>"; };
D60000812F20000000000081 /* URLActivationSuppressionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLActivationSuppressionTests.swift; sourceTree = "<group>"; };
D60001012F20000000000101 /* AppKindComparisonTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppKindComparisonTests.swift; sourceTree = "<group>"; };
D60001032F20000000000103 /* AppKeyboardCacheMultiInstanceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppKeyboardCacheMultiInstanceTests.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -687,7 +697,10 @@
4A35D5592819834600DDC108 /* NSRunningApplication.swift */,
D579258F2A1AB1DA003B83EA /* NSRunningApplication+FloatingApp.swift */,
D579258B2A1AB0A4003B83EA /* NSRunningApplication+WindowInfo.swift */,
D6A100112F2700000000A001 /* CGWindowIdentity.swift */,
D58C184328A6ABBC00F52845 /* NSRunningApplication+FocusedElement.swift */,
D6A100022F2000000000A002 /* LaunchpadOverlayDetector.swift */,
D6A100032F2000000000A003 /* SystemChrome.swift */,
4ADDC325281AC4DD0075528A /* NSApplication.swift */,
4A742D0928229A5400DCB392 /* NSWorkspace.swift */,
4AC450B1281BE00A00DA0329 /* CGRect.swift */,
Expand Down Expand Up @@ -731,6 +744,7 @@
isa = PBXGroup;
children = (
D58C184528A6B2DE00F52845 /* ISPLogger.swift */,
D6A100012F2000000000A001 /* ISPFileLog.swift */,
);
path = Log;
sourceTree = "<group>";
Expand All @@ -739,6 +753,7 @@
isa = PBXGroup;
children = (
D60001012F20000000000101 /* AppKindComparisonTests.swift */,
D60001032F20000000000103 /* AppKeyboardCacheMultiInstanceTests.swift */,
D60000512F20000000000051 /* InputSourceDeduplicationTests.swift */,
D60000112F20000000000011 /* BrowserRuleSelectionTests.swift */,
D60000312F20000000000031 /* BrowserRuleValidationTests.swift */,
Expand Down Expand Up @@ -974,6 +989,7 @@
4A881A802888559200B76498 /* NSString.swift in Sources */,
4A2A1790280BA7FA00E13249 /* Color.swift in Sources */,
D579258C2A1AB0A4003B83EA /* NSRunningApplication+WindowInfo.swift in Sources */,
D6A100102F2700000000A001 /* CGWindowIdentity.swift in Sources */,
4A2A177D280BA7FA00E13249 /* Main.xcdatamodeld in Sources */,
4A2A1795280BA7FA00E13249 /* main.swift in Sources */,
4A2A1794280BA7FA00E13249 /* AppDelegate.swift in Sources */,
Expand Down Expand Up @@ -1047,6 +1063,9 @@
D5F4A1CA2F0B1234001B2C3D /* InputSourceSwitcher.swift in Sources */,
D5115A1E2A33D57A00D94E51 /* ItemSection.swift in Sources */,
D58C184628A6B2DE00F52845 /* ISPLogger.swift in Sources */,
D6A100112F2000000000A001 /* ISPFileLog.swift in Sources */,
D6A100122F2000000000A002 /* LaunchpadOverlayDetector.swift in Sources */,
D6A100132F2000000000A003 /* SystemChrome.swift in Sources */,
4A8E47692F08814500424D11 /* SwiftUI+FlexibleButtonSizing.swift in Sources */,
4ADDC326281AC4DD0075528A /* NSApplication.swift in Sources */,
4AC2615328786EAB0032AAFE /* NSCFRange.swift in Sources */,
Expand All @@ -1059,6 +1078,7 @@
buildActionMask = 2147483647;
files = (
D60001022F20000000000102 /* AppKindComparisonTests.swift in Sources */,
D60001042F20000000000104 /* AppKeyboardCacheMultiInstanceTests.swift in Sources */,
D60000522F20000000000052 /* InputSourceDeduplicationTests.swift in Sources */,
D60000122F20000000000012 /* BrowserRuleSelectionTests.swift in Sources */,
D60000322F20000000000032 /* BrowserRuleValidationTests.swift in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion Input Source Pro.xcodeproj/xcshareddata/xcschemes/Input Source Pro.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
Expand Down
37 changes: 0 additions & 37 deletions Input Source Pro/Controllers/IndicatorWindowController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,43 +46,6 @@ class IndicatorWindowController: FloatWindowController {
super.init()

contentViewController = indicatorVC

let indicatorPublisher = indicatorVM.activateEventPublisher
.receive(on: DispatchQueue.main)
.map { (event: $0, inputSource: self.indicatorVM.state.inputSource) }
.flatMapLatest { [weak self] params -> AnyPublisher<Void, Never> in
let event = params.event
let inputSource = params.inputSource

guard let self = self else { return Empty().eraseToAnyPublisher() }
guard let appKind = self.applicationVM.appKind,
!event.isJustHide,
!preferencesVM.isHideIndicator(appKind)
else { return self.justHidePublisher() }

let app = appKind.getApp()

// Function-key toggles are one-shot status changes: always use the
// transient auto-hide path, never the persistent always-on / auto-show
// flows that are tied to the focused input field.
if case .functionKeyModeChanges = event {
return self.autoHidePublisher(event: event, inputSource: inputSource, appKind: appKind)
}

if preferencesVM.isShowAlwaysOnIndicator(app: app) {
return self.alwaysOnPublisher(event: event, inputSource: inputSource, appKind: appKind)
} else if preferencesVM.needDetectFocusedFieldChanges(app: app) {
return self.autoShowPublisher(event: event, inputSource: inputSource, appKind: appKind)
} else {
return self.autoHidePublisher(event: event, inputSource: inputSource, appKind: appKind)
}
}
.eraseToAnyPublisher()

indicatorVM.screenIsLockedPublisher
.flatMapLatest { isLocked in isLocked ? Empty().eraseToAnyPublisher() : indicatorPublisher }
.sink { _ in }
.store(in: cancelBag)
}

@available(*, unavailable)
Expand Down
10 changes: 10 additions & 0 deletions Input Source Pro/Controllers/StatusItemController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,12 @@ class StatusItemController {
changelogMenu,
checkUpdatesMenu,
settingsMenu,
NSMenuItem(
title: "Open Log…",
target: self,
action: #selector(openLog),
keyEquivalent: ""
),
NSMenuItem.separator(),
NSMenuItem(
title: "Quit".i18n(),
Expand Down Expand Up @@ -232,6 +238,10 @@ class StatusItemController {
}
}

@objc func openLog() {
ISPFileLog.openInFinder()
}

@objc func checkForUpdates() {
preferencesVM.checkUpdates()
}
Expand Down
Loading