GridLayout::SizeType size_type,
int fixed_width,
int min_width,
- size_t index,
bool is_padding)
: LayoutElement(resize_percent),
h_align_(h_align),
same_size_column_(-1),
fixed_width_(fixed_width),
min_width_(min_width),
- index_(index),
is_padding_(is_padding),
master_column_(NULL) {}
const int fixed_width_;
const int min_width_;
- // Index of this column in the ColumnSet.
- const size_t index_;
-
const bool is_padding_;
// If multiple columns have their sizes linked, one is the
class Row : public LayoutElement {
public:
- Row(bool fixed_height, int height, float resize_percent,
- ColumnSet* column_set)
+ Row(int height, float resize_percent, ColumnSet* column_set)
: LayoutElement(resize_percent),
- fixed_height_(fixed_height),
height_(height),
column_set_(column_set),
max_ascent_(0),
}
private:
- const bool fixed_height_;
const int height_;
// The column set used for this row; null for padding rows.
ColumnSet* column_set_;
int min_width,
bool is_padding) {
Column* column = new Column(h_align, v_align, resize_percent, size_type,
- fixed_width, min_width, columns_.size(),
- is_padding);
+ fixed_width, min_width, is_padding);
columns_.push_back(column);
}
void GridLayout::StartRow(float vertical_resize, int column_set_id) {
ColumnSet* column_set = GetColumnSet(column_set_id);
DCHECK(column_set);
- AddRow(new Row(false, 0, vertical_resize, column_set));
+ AddRow(new Row(0, vertical_resize, column_set));
}
void GridLayout::AddPaddingRow(float vertical_resize, int pixel_count) {
- AddRow(new Row(true, pixel_count, vertical_resize, NULL));
+ AddRow(new Row(pixel_count, vertical_resize, NULL));
}
void GridLayout::SkipColumns(int col_count) {