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

Unified Diff: apps/ui/views/app_window_frame_view.cc

Issue 588873002: Disables the maximize button for an app window with a maximum size and a custom frame color (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « apps/ui/views/app_window_frame_view.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/ui/views/app_window_frame_view.cc
diff --git a/apps/ui/views/app_window_frame_view.cc b/apps/ui/views/app_window_frame_view.cc
index fe5722526ba4b19363742af652489629665be23d..e706af2f8337201d1de2f9517eda3d98f64f0240 100644
--- a/apps/ui/views/app_window_frame_view.cc
+++ b/apps/ui/views/app_window_frame_view.cc
@@ -229,6 +229,13 @@ void AppWindowFrameView::GetWindowMask(const gfx::Size& size,
// We got nothing to say about no window mask.
}
+void AppWindowFrameView::SizeConstraintsChanged() {
+ if (draw_frame_) {
+ maximize_button_->SetEnabled(widget_->widget_delegate() &&
+ widget_->widget_delegate()->CanMaximize());
+ }
+}
+
gfx::Size AppWindowFrameView::GetPreferredSize() const {
gfx::Size pref = widget_->client_view()->GetPreferredSize();
gfx::Rect bounds(0, 0, pref.width(), pref.height());
@@ -250,10 +257,8 @@ void AppWindowFrameView::Layout() {
close_size.width(),
close_size.height());
- bool can_ever_resize = widget_->widget_delegate()
- ? widget_->widget_delegate()->CanResize()
- : false;
- maximize_button_->SetEnabled(can_ever_resize);
+ maximize_button_->SetEnabled(widget_->widget_delegate() &&
+ widget_->widget_delegate()->CanMaximize());
gfx::Size maximize_size = maximize_button_->GetPreferredSize();
maximize_button_->SetBounds(
close_button_->x() - kButtonSpacing - maximize_size.width(),
« no previous file with comments | « apps/ui/views/app_window_frame_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698