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

Merge pull request #6434 from electron/fullscreen-set-bounds

Browse source 
mac: Do not change window size when in fullscreen
This commit is contained in:
Cheng Zhao 2016-07-11 17:11:51 +09:00 • committed by GitHub
commit 5abe726678
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/native_window_mac.mm
View file

@ -737,6 +737,10 @@ bool NativeWindowMac::IsFullscreen() const {
} }
void NativeWindowMac::SetBounds(const gfx::Rect& bounds, bool animate) { void NativeWindowMac::SetBounds(const gfx::Rect& bounds, bool animate) {
// Do nothing if in fullscreen mode.
if (IsFullscreen())
return;
// Check size constraints since setFrame does not check it. // Check size constraints since setFrame does not check it.
gfx::Size size = bounds.size(); gfx::Size size = bounds.size();
size.SetToMax(GetMinimumSize()); size.SetToMax(GetMinimumSize());