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

intrinsicWidth -> pageWidth

Browse source
This commit is contained in:
Kevin Sawicki 2016-10-27 11:56:41 -07:00
parent d4ba5b4638
commit a991570677
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/native_window_mac.mm
View file

@ -117,13 +117,12 @@ bool ScopedDisableResize::disable_resize_ = false;
if (!web_contents) if (!web_contents)
return frame; return frame;
CGFloat intrinsicWidth = static_cast<CGFloat>( CGFloat pageWidth = static_cast<CGFloat>(
web_contents->GetPreferredSize().width()); web_contents->GetPreferredSize().width());
NSRect currentFrame = [window frame]; NSRect currentFrame = [window frame];
// Never shrink from the current size on zoom. // Never shrink from the current size on zoom.
CGFloat zoomedWidth = std::max(intrinsicWidth, NSWidth(currentFrame)); CGFloat zoomedWidth = std::max(pageWidth, NSWidth(currentFrame));
// |frame| determines our maximum extents. We need to set the origin of the // |frame| determines our maximum extents. We need to set the origin of the
// frame -- and only move it left if necessary. // frame -- and only move it left if necessary.