Chromium Code Reviews| 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/layout/grid_layout.h" | 5 #include "ui/views/layout/grid_layout.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "base/memory/ptr_util.h" | 11 #include "base/memory/ptr_util.h" |
| 12 #include "ui/views/layout/layout_constants.h" | 12 #include "ui/views/layout/layout_constants.h" |
| 13 #include "ui/views/view.h" | 13 #include "ui/views/view.h" |
| 14 #include "ui/views/views_delegate.h" | |
| 14 #include "ui/views/window/dialog_delegate.h" | 15 #include "ui/views/window/dialog_delegate.h" |
| 15 | 16 |
| 16 namespace views { | 17 namespace views { |
| 17 | 18 |
| 18 // LayoutElement ------------------------------------------------------ | 19 // LayoutElement ------------------------------------------------------ |
| 19 | 20 |
| 20 // A LayoutElement has a size and location along one axis. It contains | 21 // A LayoutElement has a size and location along one axis. It contains |
| 21 // methods that are used along both axis. | 22 // methods that are used along both axis. |
| 22 class LayoutElement { | 23 class LayoutElement { |
| 23 public: | 24 public: |
| (...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 644 adding_view_(false) { | 645 adding_view_(false) { |
| 645 DCHECK(host); | 646 DCHECK(host); |
| 646 } | 647 } |
| 647 | 648 |
| 648 GridLayout::~GridLayout() { | 649 GridLayout::~GridLayout() { |
| 649 } | 650 } |
| 650 | 651 |
| 651 // static | 652 // static |
| 652 GridLayout* GridLayout::CreatePanel(View* host) { | 653 GridLayout* GridLayout::CreatePanel(View* host) { |
| 653 GridLayout* layout = new GridLayout(host); | 654 GridLayout* layout = new GridLayout(host); |
| 654 layout->SetInsets(kPanelVertMargin, kButtonHEdgeMarginNew, | 655 layout->SetInsets(ViewsDelegate::GetInstance()->GetInsetsMetric( |
| 655 kPanelVertMargin, kButtonHEdgeMarginNew); | 656 InsetsMetric::BUBBLE_DIALOG)); |
|
Peter Kasting
2017/03/29 03:39:11
Did you choose to use BUBBLE_DIALOG because it was
| |
| 657 host->SetLayoutManager(layout); | |
|
Peter Kasting
2017/03/29 03:39:11
Can you also audit the existing CreatePanel() call
| |
| 656 return layout; | 658 return layout; |
| 657 } | 659 } |
| 658 | 660 |
| 659 void GridLayout::SetInsets(int top, int left, int bottom, int right) { | 661 void GridLayout::SetInsets(int top, int left, int bottom, int right) { |
| 660 insets_.Set(top, left, bottom, right); | 662 insets_.Set(top, left, bottom, right); |
| 661 } | 663 } |
| 662 | 664 |
| 663 void GridLayout::SetInsets(const gfx::Insets& insets) { | 665 void GridLayout::SetInsets(const gfx::Insets& insets) { |
| 664 insets_ = insets; | 666 insets_ = insets; |
| 665 } | 667 } |
| (...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1026 | 1028 |
| 1027 ColumnSet* GridLayout::GetLastValidColumnSet() { | 1029 ColumnSet* GridLayout::GetLastValidColumnSet() { |
| 1028 for (int i = current_row_ - 1; i >= 0; --i) { | 1030 for (int i = current_row_ - 1; i >= 0; --i) { |
| 1029 if (rows_[i]->column_set()) | 1031 if (rows_[i]->column_set()) |
| 1030 return rows_[i]->column_set(); | 1032 return rows_[i]->column_set(); |
| 1031 } | 1033 } |
| 1032 return nullptr; | 1034 return nullptr; |
| 1033 } | 1035 } |
| 1034 | 1036 |
| 1035 } // namespace views | 1037 } // namespace views |
| OLD | NEW |