Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: max window size defaults to 0 #33118

Merged
merged 2 commits into from Mar 8, 2022
Merged

fix: max window size defaults to 0 #33118

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9bdf83
fix: max window size defaults to 0
codebytere Feb 21, 2022
28885f6
fix: also check max_size empty
codebytere Feb 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 14 additions & 5 deletions shell/browser/native_window.cc
View file
Open in desktop
Expand Up @@ -160,16 +160,25 @@ void NativeWindow::InitFromOptions(const gin_helper::Dictionary& options) {
// On Linux and Window we may already have maximum size defined.
extensions::SizeConstraints size_constraints(
use_content_size ? GetContentSizeConstraints() : GetSizeConstraints());

int min_width = size_constraints.GetMinimumSize().width();
int min_height = size_constraints.GetMinimumSize().height();
options.Get(options::kMinWidth, &min_width);
options.Get(options::kMinHeight, &min_height);
size_constraints.set_minimum_size(gfx::Size(min_width, min_height));
int max_width = size_constraints.GetMaximumSize().width();
int max_height = size_constraints.GetMaximumSize().height();
options.Get(options::kMaxWidth, &max_width);
options.Get(options::kMaxHeight, &max_height);
size_constraints.set_maximum_size(gfx::Size(max_width, max_height));

gfx::Size max_size = size_constraints.GetMaximumSize();
int max_width = max_size.width() > 0 ? max_size.width() : INT_MAX;
int max_height = max_size.height() > 0 ? max_size.height() : INT_MAX;
bool have_max_width = options.Get(options::kMaxWidth, &max_width);
bool have_max_height = options.Get(options::kMaxHeight, &max_height);

// By default the window has a default maximum size that prevents it
// from being resized larger than the screen, so we should only set this
// if th user has passed in values.
if (have_max_height || have_max_width || !max_size.IsEmpty())
size_constraints.set_maximum_size(gfx::Size(max_width, max_height));

if (use_content_size) {
SetContentSizeConstraints(size_constraints);
} else {
Expand Down