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

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
Show stats 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 NativeWindow::GetContentMaximumSize() const {
gfx::Size maximum_size = GetContentSizeConstraints().GetMaximumSize(); gfx::Size maximum_size = GetContentSizeConstraints().GetMaximumSize();
#if defined(OS_WIN) #if defined(OS_WIN)
return GetExpandedWindowSize(this, maximum_size); return GetContentSizeConstraints().HasMaximumSize()
? GetExpandedWindowSize(this, maximum_size)
: maximum_size;
#else #else
return maximum_size; return maximum_size;
#endif #endif