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

fix zoom button when alwaysOnTop set (#19314)

Browse source
This commit is contained in:
Micha Hanselmann 2019-07-19 16:17:59 -07:00 • committed by Shelley Vohr
parent e389fa75ea
commit 42d4c579c3
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
shell/browser/native_window_mac.mm
View file

@ -853,7 +853,12 @@ void NativeWindowMac::SetAlwaysOnTop(bool top,
NSInteger newLevel = windowLevel + relativeLevel; NSInteger newLevel = windowLevel + relativeLevel;
if (newLevel >= minWindowLevel && newLevel <= maxWindowLevel) { if (newLevel >= minWindowLevel && newLevel <= maxWindowLevel) {
was_maximizable_ = IsMaximizable();
[window_ setLevel:newLevel]; [window_ setLevel:newLevel];
// Set level will make the zoom button revert to default, probably
// a bug of Cocoa or macOS.
[[window_ standardWindowButton:NSWindowZoomButton]
setEnabled:was_maximizable_];
} else { } else {
*error = std::string([[NSString *error = std::string([[NSString
stringWithFormat:@"relativeLevel must be between %d and %d", stringWithFormat:@"relativeLevel must be between %d and %d",