github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: Check minSize constraints before resizing (backport: 3-0-x) (#15038)

Browse Source
This commit is contained in:
trop[bot]
2018-10-09 10:52:00 -07:00
committed by Jeremy Apthorp
parent 8f743e6fbe
commit 524bb99948
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -881,7 +881,7 @@ Disable or enable the window.
* `height` Integer
* `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()`