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

osx: Call setContentMinSize in SetContentSizeConstraints

Browse source
This commit is contained in:
Cheng Zhao 2015-10-05 20:09:29 +08:00
parent a9b0111c3e
commit d19ead1907
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/native_window_mac.mm
View file

@ -559,11 +559,11 @@ void NativeWindowMac::SetContentSizeConstraints(
NSView* content = [window_ contentView]; NSView* content = [window_ contentView];
if (size_constraints.HasMinimumSize()) { if (size_constraints.HasMinimumSize()) {
NSSize min_size = ToNSSize(size_constraints.GetMinimumSize()); NSSize min_size = ToNSSize(size_constraints.GetMinimumSize());
[window_ setMinSize:[content convertSize:min_size toView:nil]]; [window_ setContentMinSize:[content convertSize:min_size toView:nil]];
} }
if (size_constraints.HasMaximumSize()) { if (size_constraints.HasMaximumSize()) {
NSSize max_size = ToNSSize(size_constraints.GetMaximumSize()); NSSize max_size = ToNSSize(size_constraints.GetMaximumSize());
[window_ setMaxSize:[content convertSize:max_size toView:nil]]; [window_ setContentMaxSize:[content convertSize:max_size toView:nil]];
} }
NativeWindow::SetContentSizeConstraints(size_constraints); NativeWindow::SetContentSizeConstraints(size_constraints);
} }