bitgapp/eqMac
1
1
Fork 0
mirror of https://github.com/bitgapp/eqMac.git synced 2024-11-22 22:32:17 +03:00
Code Issues Projects Releases Wiki Activity

fixed

Browse Source
This commit is contained in:
Romans Kisils 2017-07-29 12:11:13 +01:00
parent b9fb8e2eab
commit bb743ec3cd
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Source/AppDelegate.mm
View File

@ -21,6 +21,9 @@ eqMacStatusItemView *statusItemView;
//Windows
NSPopover *settingsPopover;
NSPopover *eqPopover;
NSEvent *eqPopoverTransiencyMonitor;
NSEvent *settingsPopoverTransiencyMonitor;
@implementation AppDelegate
@ -54,6 +57,8 @@ NSPopover *eqPopover;
NSNotificationCenter *observer = [NSNotificationCenter defaultCenter];
[observer addObserver:self selector:@selector(changeVolume:) name:@"changeVolume" object:nil];
[observer addObserver:self selector:@selector(quitApplication) name:@"closeApp" object:nil];
[observer addObserver:self selector:@selector(closePopovers) name:@"escapePressed" object:nil];
[EQHost detectAndRemoveRoguePassthroughDevice];
[self checkAndInstallDriver];
@ -65,10 +70,12 @@ NSPopover *eqPopover;
eqPopover = [[NSPopover alloc] init];
[eqPopover setDelegate:self];
[eqPopover setContentViewController:eqVC];
[eqPopover setBehavior:NSPopoverBehaviorTransient];
settingsPopover = [[NSPopover alloc] init];
[settingsPopover setDelegate:self];
[settingsPopover setContentViewController:settingsVC];
[settingsPopover setBehavior:NSPopoverBehaviorTransient];
[volumeHUD.window setCollectionBehavior:NSWindowCollectionBehaviorCanJoinAllSpaces | NSWindowCollectionBehaviorTransient];
[volumeHUD.window setLevel:NSPopUpMenuWindowLevel];
@ -194,6 +201,14 @@ NSPopover *eqPopover;
}else{
if([settingsPopover isShown]) [settingsPopover close];
[eqPopover showRelativeToRect:statusItemView.bounds ofView:statusItemView preferredEdge:NSMaxYEdge];
[[NSRunningApplication currentApplication] activateWithOptions:NSApplicationActivateIgnoringOtherApps];
if (eqPopoverTransiencyMonitor == nil) {
eqPopoverTransiencyMonitor = [NSEvent addGlobalMonitorForEventsMatchingMask:(NSLeftMouseDownMask | NSRightMouseDownMask | NSKeyUpMask) handler:^(NSEvent* event) {
[NSEvent removeMonitor:eqPopoverTransiencyMonitor];
eqPopoverTransiencyMonitor = nil;
[eqPopover close];
}];
}
}
}
@ -204,9 +219,21 @@ NSPopover *eqPopover;
}else{
if([eqPopover isShown]) [eqPopover close];
[settingsPopover showRelativeToRect:statusItemView.bounds ofView:statusItemView preferredEdge:NSMaxYEdge];
[[NSRunningApplication currentApplication] activateWithOptions:NSApplicationActivateIgnoringOtherApps];
if (settingsPopoverTransiencyMonitor == nil) {
settingsPopoverTransiencyMonitor = [NSEvent addGlobalMonitorForEventsMatchingMask:(NSLeftMouseDownMask | NSRightMouseDownMask | NSKeyUpMask) handler:^(NSEvent* event) {
[NSEvent removeMonitor:settingsPopoverTransiencyMonitor];
settingsPopoverTransiencyMonitor = nil;
[settingsPopover close];
}];
}
}
}
-(void)closePopovers{
if([eqPopover isShown]) [eqPopover close];
if([settingsPopover isShown]) [settingsPopover close];
}
-(void)popoverWillShow:(NSNotification *)notification{
[[NSNotificationCenter defaultCenter] postNotificationName:@"settingsPopoverWillOpen" object:nil];
}

4
Source/NSAppEventCather.m
View File

@ -36,6 +36,10 @@
}
}
if([event type] == NSKeyDown && [event keyCode] == 53){
[[NSNotificationCenter defaultCenter] postNotificationName:@"escapePressed" object:nil];
}
[super sendEvent: event];
}