| 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 #ifndef UI_VIEWS_LAYOUT_GRID_LAYOUT_H_ | 5 #ifndef UI_VIEWS_LAYOUT_GRID_LAYOUT_H_ |
| 6 #define UI_VIEWS_LAYOUT_GRID_LAYOUT_H_ | 6 #define UI_VIEWS_LAYOUT_GRID_LAYOUT_H_ |
| 7 | 7 |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 | 122 |
| 123 // Adds a padding row. Padding rows typically don't have any views, and | 123 // Adds a padding row. Padding rows typically don't have any views, and |
| 124 // but are used to provide vertical white space between views. | 124 // but are used to provide vertical white space between views. |
| 125 // Size specifies the height of the row. | 125 // Size specifies the height of the row. |
| 126 void AddPaddingRow(float vertical_resize, int size); | 126 void AddPaddingRow(float vertical_resize, int size); |
| 127 | 127 |
| 128 // A convenience for AddPaddingRow followed by StartRow. | 128 // A convenience for AddPaddingRow followed by StartRow. |
| 129 void StartRowWithPadding(float vertical_resize, int column_set_id, | 129 void StartRowWithPadding(float vertical_resize, int column_set_id, |
| 130 float padding_resize, int padding); | 130 float padding_resize, int padding); |
| 131 | 131 |
| 132 // Starts a new row with the specified column set. | 132 // Starts a new row with the specified column set and height (0 for |
| 133 void StartRow(float vertical_resize, int column_set_id); | 133 // unspecified height). |
| 134 void StartRow(float vertical_resize, int column_set_id, int height = 0); |
| 134 | 135 |
| 135 // Advances past columns. Use this when the current column should not | 136 // Advances past columns. Use this when the current column should not |
| 136 // contain any views. | 137 // contain any views. |
| 137 void SkipColumns(int col_count); | 138 void SkipColumns(int col_count); |
| 138 | 139 |
| 139 // Adds a view using the default alignment from the column. The added | 140 // Adds a view using the default alignment from the column. The added |
| 140 // view has a column and row span of 1. | 141 // view has a column and row span of 1. |
| 141 // As a convenience this adds the view to the host. The view becomes owned | 142 // As a convenience this adds the view to the host. The view becomes owned |
| 142 // by the host, and NOT this GridLayout. | 143 // by the host, and NOT this GridLayout. |
| 143 void AddView(View* view); | 144 void AddView(View* view); |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 364 // The master column of those columns that are linked. See Column | 365 // The master column of those columns that are linked. See Column |
| 365 // for a description of what the master column is. | 366 // for a description of what the master column is. |
| 366 std::vector<Column*> master_columns_; | 367 std::vector<Column*> master_columns_; |
| 367 | 368 |
| 368 DISALLOW_COPY_AND_ASSIGN(ColumnSet); | 369 DISALLOW_COPY_AND_ASSIGN(ColumnSet); |
| 369 }; | 370 }; |
| 370 | 371 |
| 371 } // namespace views | 372 } // namespace views |
| 372 | 373 |
| 373 #endif // UI_VIEWS_LAYOUT_GRID_LAYOUT_H_ | 374 #endif // UI_VIEWS_LAYOUT_GRID_LAYOUT_H_ |
| OLD | NEW |