nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-14 07:02:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed various issues with Autotype determining the wrong window title

Browse Source
This commit is contained in:
michael starke
2017-09-04 11:01:39 +02:00
parent 00c3918b12
commit 34c33ef008
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
MacPass/MPAutotypeDaemon.m
View File

@@ -263,6 +263,9 @@ static MPAutotypeDaemon *_sharedInstance;
- (NSDictionary *)_infoDictionaryForApplication:(NSRunningApplication *)application { - (NSDictionary *)_infoDictionaryForApplication:(NSRunningApplication *)application {
NSArray *currentWindows = CFBridgingRelease(CGWindowListCopyWindowInfo(kCGWindowListExcludeDesktopElements, kCGNullWindowID)); NSArray *currentWindows = CFBridgingRelease(CGWindowListCopyWindowInfo(kCGWindowListExcludeDesktopElements, kCGNullWindowID));
NSArray *windowNumbers = [NSWindow windowNumbersWithOptions:NSWindowNumberListAllApplications];
NSUInteger minZIndex = NSNotFound;
NSDictionary *infoDict = nil;
for(NSDictionary *windowDict in currentWindows) { for(NSDictionary *windowDict in currentWindows) {
NSString *windowTitle = windowDict[(NSString *)kCGWindowName]; NSString *windowTitle = windowDict[(NSString *)kCGWindowName];
if(windowTitle.length <= 0) { if(windowTitle.length <= 0) {
@@ -270,13 +273,19 @@ static MPAutotypeDaemon *_sharedInstance;
} }
NSNumber *processId = windowDict[(NSString *)kCGWindowOwnerPID]; NSNumber *processId = windowDict[(NSString *)kCGWindowOwnerPID];
if(processId && [processId isEqualToNumber:@(application.processIdentifier)]) { if(processId && [processId isEqualToNumber:@(application.processIdentifier)]) {
return @{
kMPWindowTitleKey: windowDict[(NSString *)kCGWindowName], NSNumber *number = (NSNumber *)windowDict[(NSString *)kCGWindowNumber];
NSUInteger zIndex = [windowNumbers indexOfObject:number];
if(zIndex < minZIndex) {
minZIndex = zIndex;
infoDict = @{
kMPWindowTitleKey: windowTitle,
kMPProcessIdentifierKey : processId kMPProcessIdentifierKey : processId
}; };
} }
} }
return nil; }
return infoDict;
} }
- (void)_presentSelectionWindow:(NSArray *)candidates { - (void)_presentSelectionWindow:(NSArray *)candidates {