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

fix: Check minSize constraints before resizing (#14931)

Browse source 
* Inital setSize check

* Only resize if above minimum size constraints

* lint

* Resize to min if size is changed

* Remove unneeded if statement

* chore: remove trailing whitespace

* Add note about setSize method in docs
This commit is contained in:
Troy 2018-10-09 10:08:15 -07:00 committed by Charles Kerr
parent 532ee2dadf
commit d678d9ee75
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/api/atom_api_top_level_window.cc
View file

@ -403,8 +403,10 @@ gfx::Rect TopLevelWindow::GetContentBounds() {
void TopLevelWindow::SetSize(int width, int height, mate::Arguments* args) { void TopLevelWindow::SetSize(int width, int height, mate::Arguments* args) {
bool animate = false; bool animate = false;
gfx::Size size = window_->GetMinimumSize();
size.SetToMax(gfx::Size(width, height));
args->GetNext(&animate); args->GetNext(&animate);
window_->SetSize(gfx::Size(width, height), animate); window_->SetSize(size, animate);
} }
std::vector<int> TopLevelWindow::GetSize() { std::vector<int> TopLevelWindow::GetSize() {

2
docs/api/browser-window.md
View file

@ -920,7 +920,7 @@ Disable or enable the window.
* `height` Integer * `height` Integer
* `animate` Boolean (optional) _macOS_ * `animate` Boolean (optional) _macOS_
Resizes the window to `width` and `height`. Resizes the window to `width` and `height`. If `width` or `height` are below any set minimum size constraints the window will snap to its minimum size.
#### `win.getSize()` #### `win.getSize()`