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

Merge pull request #4682 from phamdaniel/ismaximized

Browse source 
Fix `isMaximized()` in window for when resizable is set to false on OSX
This commit is contained in:
Cheng Zhao 2016-03-06 19:23:46 +09:00
commit 2a0be28111
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
atom/browser/native_window_mac.mm
View file

@ -573,7 +573,16 @@ void NativeWindowMac::Unmaximize() {
} }
bool NativeWindowMac::IsMaximized() { bool NativeWindowMac::IsMaximized() {
return [window_ isZoomed]; if (([window_ styleMask] & NSResizableWindowMask) != 0) {
return [window_ isZoomed];
} else {
NSRect rectScreen = [[NSScreen mainScreen] visibleFrame];
NSRect rectWindow = [window_ frame];
return (rectScreen.origin.x == rectWindow.origin.x &&
rectScreen.origin.y == rectWindow.origin.y &&
rectScreen.size.width == rectWindow.size.width &&
rectScreen.size.height == rectWindow.size.height);
}
} }
void NativeWindowMac::Minimize() { void NativeWindowMac::Minimize() {