OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ui/views/controls/scroll_view.h" | 5 #include "ui/views/controls/scroll_view.h" |
6 | 6 |
7 #include "base/feature_list.h" | 7 #include "base/feature_list.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
10 #include "ui/events/event.h" | 10 #include "ui/events/event.h" |
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
265 | 265 |
266 void ScrollView::SetVerticalScrollBar(ScrollBar* vert_sb) { | 266 void ScrollView::SetVerticalScrollBar(ScrollBar* vert_sb) { |
267 DCHECK(vert_sb); | 267 DCHECK(vert_sb); |
268 vert_sb->SetVisible(vert_sb_->visible()); | 268 vert_sb->SetVisible(vert_sb_->visible()); |
269 delete vert_sb_; | 269 delete vert_sb_; |
270 vert_sb->set_controller(this); | 270 vert_sb->set_controller(this); |
271 vert_sb_ = vert_sb; | 271 vert_sb_ = vert_sb; |
272 } | 272 } |
273 | 273 |
274 gfx::Size ScrollView::GetPreferredSize() const { | 274 gfx::Size ScrollView::GetPreferredSize() const { |
275 if (!is_bounded()) | |
276 return View::GetPreferredSize(); | |
277 | |
278 gfx::Size size = contents()->GetPreferredSize(); | 275 gfx::Size size = contents()->GetPreferredSize(); |
279 size.SetToMax(gfx::Size(size.width(), min_height_)); | 276 if (is_bounded()) { |
280 size.SetToMin(gfx::Size(size.width(), max_height_)); | 277 size.SetToMax(gfx::Size(size.width(), min_height_)); |
| 278 size.SetToMin(gfx::Size(size.width(), max_height_)); |
| 279 } |
281 gfx::Insets insets = GetInsets(); | 280 gfx::Insets insets = GetInsets(); |
282 size.Enlarge(insets.width(), insets.height()); | 281 size.Enlarge(insets.width(), insets.height()); |
283 return size; | 282 return size; |
284 } | 283 } |
285 | 284 |
286 int ScrollView::GetHeightForWidth(int width) const { | 285 int ScrollView::GetHeightForWidth(int width) const { |
287 if (!is_bounded()) | 286 if (!is_bounded()) |
288 return View::GetHeightForWidth(width); | 287 return View::GetHeightForWidth(width); |
289 | 288 |
290 gfx::Insets insets = GetInsets(); | 289 gfx::Insets insets = GetInsets(); |
(...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
766 | 765 |
767 VariableRowHeightScrollHelper::RowInfo | 766 VariableRowHeightScrollHelper::RowInfo |
768 FixedRowHeightScrollHelper::GetRowInfo(int y) { | 767 FixedRowHeightScrollHelper::GetRowInfo(int y) { |
769 if (y < top_margin_) | 768 if (y < top_margin_) |
770 return RowInfo(0, top_margin_); | 769 return RowInfo(0, top_margin_); |
771 return RowInfo((y - top_margin_) / row_height_ * row_height_ + top_margin_, | 770 return RowInfo((y - top_margin_) / row_height_ * row_height_ + top_margin_, |
772 row_height_); | 771 row_height_); |
773 } | 772 } |
774 | 773 |
775 } // namespace views | 774 } // namespace views |
OLD | NEW |