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/stl_util.h" | 10 #include "base/stl_util.h" |
(...skipping 660 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
671 | 671 |
672 GridLayout::~GridLayout() { | 672 GridLayout::~GridLayout() { |
673 STLDeleteElements(&column_sets_); | 673 STLDeleteElements(&column_sets_); |
674 STLDeleteElements(&view_states_); | 674 STLDeleteElements(&view_states_); |
675 STLDeleteElements(&rows_); | 675 STLDeleteElements(&rows_); |
676 } | 676 } |
677 | 677 |
678 // static | 678 // static |
679 GridLayout* GridLayout::CreatePanel(View* host) { | 679 GridLayout* GridLayout::CreatePanel(View* host) { |
680 GridLayout* layout = new GridLayout(host); | 680 GridLayout* layout = new GridLayout(host); |
681 | 681 layout->SetInsets(kPanelVertMargin, kButtonHEdgeMarginNew, |
682 const int horizontal_margin = DialogDelegate::UseNewStyle() ? | 682 kPanelVertMargin, kButtonHEdgeMarginNew); |
683 kButtonHEdgeMarginNew : kPanelHorizMargin; | |
684 | |
685 layout->SetInsets(kPanelVertMargin, horizontal_margin, | |
686 kPanelVertMargin, horizontal_margin); | |
687 return layout; | 683 return layout; |
688 } | 684 } |
689 | 685 |
690 void GridLayout::SetInsets(int top, int left, int bottom, int right) { | 686 void GridLayout::SetInsets(int top, int left, int bottom, int right) { |
691 insets_.Set(top, left, bottom, right); | 687 insets_.Set(top, left, bottom, right); |
692 } | 688 } |
693 | 689 |
694 void GridLayout::SetInsets(const gfx::Insets& insets) { | 690 void GridLayout::SetInsets(const gfx::Insets& insets) { |
695 insets_ = insets; | 691 insets_ = insets; |
696 } | 692 } |
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1067 | 1063 |
1068 ColumnSet* GridLayout::GetLastValidColumnSet() { | 1064 ColumnSet* GridLayout::GetLastValidColumnSet() { |
1069 for (int i = current_row_ - 1; i >= 0; --i) { | 1065 for (int i = current_row_ - 1; i >= 0; --i) { |
1070 if (rows_[i]->column_set()) | 1066 if (rows_[i]->column_set()) |
1071 return rows_[i]->column_set(); | 1067 return rows_[i]->column_set(); |
1072 } | 1068 } |
1073 return NULL; | 1069 return NULL; |
1074 } | 1070 } |
1075 | 1071 |
1076 } // namespace views | 1072 } // namespace views |
OLD | NEW |