mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3853 from jrehbein/fix-issue-3739-mac-dockshow

Browse source 
DockShow workaround for issue #3739
This commit is contained in:
Cheng Zhao 2015-12-21 10:38:52 +08:00
commit 8d094d99da
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
atom/browser/browser_mac.mm
View file

@ -70,8 +70,21 @@ void Browser::DockHide() {
}
void Browser::DockShow() {
BOOL active = [[NSRunningApplication currentApplication] isActive];
ProcessSerialNumber psn = { 0, kCurrentProcess };
TransformProcessType(&psn, kProcessTransformToForegroundApplication);
if (active) {
// Workaround buggy behavior of TransformProcessType
for (NSRunningApplication * app in [NSRunningApplication runningApplicationsWithBundleIdentifier:@"com.apple.dock"]) {
[app activateWithOptions:NSApplicationActivateIgnoringOtherApps];
break;
}
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.001 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
TransformProcessType(&psn, kProcessTransformToForegroundApplication);
[[NSRunningApplication currentApplication] activateWithOptions:NSApplicationActivateIgnoringOtherApps];
});
} else {
TransformProcessType(&psn, kProcessTransformToForegroundApplication);
}
}
void Browser::DockSetMenu(ui::MenuModel* model) {