Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(149)

Unified Diff: views/widget/widget.cc

Issue 8273040: Minimum size for aura window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: " Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« views/widget/widget.h ('K') | « views/widget/widget.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/widget/widget.cc
diff --git a/views/widget/widget.cc b/views/widget/widget.cc
index 8baf11c383d8c0a8c3dae552904402a0dc15f56c..b8377722b77e9c1453ec69ecbf84de71c1fdf45c 100644
--- a/views/widget/widget.cc
+++ b/views/widget/widget.cc
@@ -904,7 +904,7 @@ void Widget::OnNativeWidgetDestroyed() {
}
gfx::Size Widget::GetMinimumSize() {
- return non_client_view_ ? non_client_view_->GetMinimumSize() : gfx::Size();
+ return non_client_view_ ? non_client_view_->GetMinimumSize() : minimum_size_;
}
void Widget::OnNativeWidgetSizeChanged(const gfx::Size& new_size) {
@@ -1160,12 +1160,13 @@ bool Widget::GetSavedWindowPlacement(gfx::Rect* bounds,
if (!widget_delegate_->ShouldRestoreWindowSize()) {
bounds->set_size(non_client_view_->GetPreferredSize());
} else {
+ gfx::Size minimum_size = GetMinimumSize();
// Make sure the bounds are at least the minimum size.
- if (bounds->width() < minimum_size_.width())
- bounds->set_width(minimum_size_.width());
+ if (bounds->width() < minimum_size.width())
+ bounds->set_width(minimum_size.width());
- if (bounds->height() < minimum_size_.height())
- bounds->set_height(minimum_size_.height());
+ if (bounds->height() < minimum_size.height())
+ bounds->set_height(minimum_size.height());
}
return true;
}
« views/widget/widget.h ('K') | « views/widget/widget.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698