github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-29 01:08:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Only expand maximum size constraint if there was a constraint originally (#13003)

Browse Source
This commit is contained in:
Heilig Benedek
2018-05-21 02:56:45 +02:00
committed by Samuel Attard
parent 156a97b80d
commit 8b2bffcf9e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
atom/browser/native_window.cc
View File

@@ -288,7 +288,9 @@ gfx::Size NativeWindow::GetContentMinimumSize() const {
gfx::Size NativeWindow::GetContentMaximumSize() const {
gfx::Size maximum_size = GetContentSizeConstraints().GetMaximumSize();
#if defined(OS_WIN)
return GetExpandedWindowSize(this, maximum_size);
return GetContentSizeConstraints().HasMaximumSize()
? GetExpandedWindowSize(this, maximum_size)
: maximum_size;
#else
return maximum_size;
#endif