github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

🍎 Fix an issue where alwaysOnTop window disappears when restored from the application icon

Browse Source
This commit is contained in:
Shubham
2017-06-07 12:28:50 -04:00
parent dfab1043d9
commit f001377493
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
atom/browser/native_window_mac.mm
View File

@@ -75,6 +75,7 @@ bool ScopedDisableResize::disable_resize_ = false;
@private
atom::NativeWindowMac* shell_;
bool is_zooming_;
int level_;
}
- (id)initWithShell:(atom::NativeWindowMac*)shell;
@end
@@ -204,11 +205,20 @@ bool ScopedDisableResize::disable_resize_ = false;
shell_->NotifyWindowMoved();
}
- (void)windowWillMiniaturize:(NSNotification*)notification {
NSWindow* window = shell_->GetNativeWindow();
// store the current level to be restored in windowDidDeminiaturize
level_ = NSStatusWindowLevel;
[window setLevel:NSNormalWindowLevel];
}
- (void)windowDidMiniaturize:(NSNotification*)notification {
shell_->NotifyWindowMinimize();
}
- (void)windowDidDeminiaturize:(NSNotification*)notification {
NSWindow* window = shell_->GetNativeWindow();
[window setLevel:level_];
shell_->NotifyWindowRestore();
}