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

Side by Side Diff: ash/system/tray/fixed_sized_scroll_view.cc

Issue 273223002: views: Make view::Views::GetPreferredSize() const. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More compile fix for ToT Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/system/tray/fixed_sized_scroll_view.h ('k') | ash/system/tray/hover_highlight_view.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/system/tray/fixed_sized_scroll_view.h" 5 #include "ash/system/tray/fixed_sized_scroll_view.h"
6 6
7 namespace ash { 7 namespace ash {
8 8
9 FixedSizedScrollView::FixedSizedScrollView() { 9 FixedSizedScrollView::FixedSizedScrollView() {
10 set_notify_enter_exit_on_child(true); 10 set_notify_enter_exit_on_child(true);
11 } 11 }
12 12
13 FixedSizedScrollView::~FixedSizedScrollView() { 13 FixedSizedScrollView::~FixedSizedScrollView() {
14 } 14 }
15 15
16 void FixedSizedScrollView::SetContentsView(views::View* view) { 16 void FixedSizedScrollView::SetContentsView(views::View* view) {
17 SetContents(view); 17 SetContents(view);
18 view->SetBoundsRect(gfx::Rect(view->GetPreferredSize())); 18 view->SetBoundsRect(gfx::Rect(view->GetPreferredSize()));
19 } 19 }
20 20
21 void FixedSizedScrollView::SetFixedSize(const gfx::Size& size) { 21 void FixedSizedScrollView::SetFixedSize(const gfx::Size& size) {
22 if (fixed_size_ == size) 22 if (fixed_size_ == size)
23 return; 23 return;
24 fixed_size_ = size; 24 fixed_size_ = size;
25 PreferredSizeChanged(); 25 PreferredSizeChanged();
26 } 26 }
27 27
28 gfx::Size FixedSizedScrollView::GetPreferredSize() { 28 gfx::Size FixedSizedScrollView::GetPreferredSize() const {
29 gfx::Size size = fixed_size_.IsEmpty() ? 29 gfx::Size size = fixed_size_.IsEmpty() ?
30 contents()->GetPreferredSize() : fixed_size_; 30 contents()->GetPreferredSize() : fixed_size_;
31 gfx::Insets insets = GetInsets(); 31 gfx::Insets insets = GetInsets();
32 size.Enlarge(insets.width(), insets.height()); 32 size.Enlarge(insets.width(), insets.height());
33 return size; 33 return size;
34 } 34 }
35 35
36 void FixedSizedScrollView::Layout() { 36 void FixedSizedScrollView::Layout() {
37 gfx::Rect bounds = gfx::Rect(contents()->GetPreferredSize()); 37 gfx::Rect bounds = gfx::Rect(contents()->GetPreferredSize());
38 bounds.set_width(std::max(0, width() - GetScrollBarWidth())); 38 bounds.set_width(std::max(0, width() - GetScrollBarWidth()));
39 contents()->SetBoundsRect(bounds); 39 contents()->SetBoundsRect(bounds);
40 40
41 views::ScrollView::Layout(); 41 views::ScrollView::Layout();
42 if (!vertical_scroll_bar()->visible()) { 42 if (!vertical_scroll_bar()->visible()) {
43 gfx::Rect bounds = contents()->bounds(); 43 gfx::Rect bounds = contents()->bounds();
44 bounds.set_width(bounds.width() + GetScrollBarWidth()); 44 bounds.set_width(bounds.width() + GetScrollBarWidth());
45 contents()->SetBoundsRect(bounds); 45 contents()->SetBoundsRect(bounds);
46 } 46 }
47 } 47 }
48 48
49 void FixedSizedScrollView::OnBoundsChanged(const gfx::Rect& previous_bounds) { 49 void FixedSizedScrollView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
50 gfx::Rect bounds = gfx::Rect(contents()->GetPreferredSize()); 50 gfx::Rect bounds = gfx::Rect(contents()->GetPreferredSize());
51 bounds.set_width(std::max(0, width() - GetScrollBarWidth())); 51 bounds.set_width(std::max(0, width() - GetScrollBarWidth()));
52 contents()->SetBoundsRect(bounds); 52 contents()->SetBoundsRect(bounds);
53 } 53 }
54 54
55 } // namespace ash 55 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/fixed_sized_scroll_view.h ('k') | ash/system/tray/hover_highlight_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698