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

Initialize level_ in initWithShell

Browse Source
This commit is contained in:
Kevin Sawicki
2017-07-14 10:07:06 -07:00
parent 12b90a2304
commit 4935e8567f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
atom/browser/native_window_mac.mm
View File

@@ -86,6 +86,7 @@ bool ScopedDisableResize::disable_resize_ = false;
if ((self = [super init])) {
shell_ = shell;
is_zooming_ = false;
level_ = [shell_->GetNativeWindow() level];
}
return self;
}
@@ -217,8 +218,7 @@ bool ScopedDisableResize::disable_resize_ = false;
}
- (void)windowDidDeminiaturize:(NSNotification*)notification {
NSWindow* window = shell_->GetNativeWindow();
[window setLevel:level_];
[shell_->GetNativeWindow() setLevel:level_];
shell_->NotifyWindowRestore();
}

2
spec/api-browser-window-spec.js
View File

@@ -620,7 +620,7 @@ describe('BrowserWindow module', function () {
})
})
describe.only('BrowserWindow.alwaysOnTop() resets level on minimize', function () {
describe('BrowserWindow.alwaysOnTop() resets level on minimize', function () {
if (process.platform !== 'darwin') {
return
}