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

Merge pull request #6363 from MarshallOfSound/master

Browse source 
Bound the target width and height of window when calling SetSize
This commit is contained in:
Cheng Zhao 2016-07-07 19:52:47 +09:00 • committed by GitHub
commit 43e9f30b21
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
atom/browser/native_window_mac.mm
View file

@ -737,13 +737,21 @@ bool NativeWindowMac::IsFullscreen() const {
} }
void NativeWindowMac::SetBounds(const gfx::Rect& bounds, bool animate) { void NativeWindowMac::SetBounds(const gfx::Rect& bounds, bool animate) {
gfx::Size bSize = gfx::Size(bounds.width(), bounds.height());
bSize.SetToMax(GetMinimumSize());
gfx::Size maxSize = GetMaximumSize();
maxSize = gfx::Size(maxSize.width() == 0 ? bSize.width() : maxSize.width(),
maxSize.height() == 0 ? bSize.height() : maxSize.height());
bSize.SetToMin(maxSize);
NSRect cocoa_bounds = NSMakeRect(bounds.x(), 0, NSRect cocoa_bounds = NSMakeRect(bounds.x(), 0,
bounds.width(), bSize.width(),
bounds.height()); bSize.height());
// Flip coordinates based on the primary screen. // Flip coordinates based on the primary screen.
NSScreen* screen = [[NSScreen screens] objectAtIndex:0]; NSScreen* screen = [[NSScreen screens] objectAtIndex:0];
cocoa_bounds.origin.y = cocoa_bounds.origin.y =
NSHeight([screen frame]) - bounds.height() - bounds.y(); NSHeight([screen frame]) - bSize.height() - bounds.y();
[window_ setFrame:cocoa_bounds display:YES animate:animate]; [window_ setFrame:cocoa_bounds display:YES animate:animate];
} }