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

fix: maxWidth not being respected (#32628)

Browse source
This commit is contained in:
Jeremy Rose 2022-01-26 14:00:17 -08:00 committed by GitHub
parent 7caa88c46f
commit 16fcad3488
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
shell/browser/native_window.cc
View file

@ -161,16 +161,16 @@ void NativeWindow::InitFromOptions(const gin_helper::Dictionary& options) {
// On Linux and Window we may already have maximum size defined. // On Linux and Window we may already have maximum size defined.
extensions::SizeConstraints size_constraints( extensions::SizeConstraints size_constraints(
use_content_size ? GetContentSizeConstraints() : GetSizeConstraints()); use_content_size ? GetContentSizeConstraints() : GetSizeConstraints());
int min_height = 0, min_width = 0; int min_width = size_constraints.GetMinimumSize().width();
if (options.Get(options::kMinHeight, &min_height) || int min_height = size_constraints.GetMinimumSize().height();
options.Get(options::kMinWidth, &min_width)) { options.Get(options::kMinWidth, &min_width);
size_constraints.set_minimum_size(gfx::Size(min_width, min_height)); options.Get(options::kMinHeight, &min_height);
} size_constraints.set_minimum_size(gfx::Size(min_width, min_height));
int max_height = INT_MAX, max_width = INT_MAX; int max_width = size_constraints.GetMaximumSize().width();
if (options.Get(options::kMaxHeight, &max_height) || int max_height = size_constraints.GetMaximumSize().height();
options.Get(options::kMaxWidth, &max_width)) { options.Get(options::kMaxWidth, &max_width);
size_constraints.set_maximum_size(gfx::Size(max_width, max_height)); options.Get(options::kMaxHeight, &max_height);
} size_constraints.set_maximum_size(gfx::Size(max_width, max_height));
if (use_content_size) { if (use_content_size) {
SetContentSizeConstraints(size_constraints); SetContentSizeConstraints(size_constraints);
} else { } else {