Merge pull request #15903 from groud/fix_minsize
Fixes GridContainer and SplitContainer wrong layouting
This commit is contained in:
Rémi Verschelde
GitHub
commit
1f17881d5d
|
|
@ -43,107 +43,118 @@ void GridContainer::_notification(int p_what) {
|
|||
|
||||
int hsep = get_constant("hseparation");
|
||||
int vsep = get_constant("vseparation");
|
||||
int max_col = MIN(get_child_count(), columns);
|
||||
int max_row = get_child_count() / columns;
|
||||
|
||||
int idx = 0;
|
||||
int max_row = 0;
|
||||
int max_col = 0;
|
||||
|
||||
Size2 size = get_size();
|
||||
|
||||
// Compute the per-column/per-row data
|
||||
for (int i = 0; i < get_child_count(); i++) {
|
||||
|
||||
Control *c = Object::cast_to<Control>(get_child(i));
|
||||
if (!c || !c->is_visible_in_tree())
|
||||
continue;
|
||||
|
||||
int row = idx / columns;
|
||||
int col = idx % columns;
|
||||
int row = i / columns;
|
||||
int col = i % columns;
|
||||
|
||||
Size2i ms = c->get_combined_minimum_size();
|
||||
if (col_minw.has(col))
|
||||
col_minw[col] = MAX(col_minw[col], ms.width);
|
||||
else
|
||||
col_minw[col] = ms.width;
|
||||
|
||||
if (row_minh.has(row))
|
||||
row_minh[row] = MAX(row_minh[row], ms.height);
|
||||
else
|
||||
row_minh[row] = ms.height;
|
||||
|
||||
//print_line("store row "+itos(row)+" mw "+itos(ms.height));
|
||||
|
||||
if (c->get_h_size_flags() & SIZE_EXPAND)
|
||||
if (c->get_h_size_flags() & SIZE_EXPAND) {
|
||||
col_expanded.insert(col);
|
||||
if (c->get_v_size_flags() & SIZE_EXPAND)
|
||||
}
|
||||
if (c->get_v_size_flags() & SIZE_EXPAND) {
|
||||
row_expanded.insert(row);
|
||||
|
||||
max_col = MAX(col, max_col);
|
||||
max_row = MAX(row, max_row);
|
||||
idx++;
|
||||
}
|
||||
}
|
||||
|
||||
Size2 ms;
|
||||
int expand_rows = 0;
|
||||
int expand_cols = 0;
|
||||
|
||||
// Evaluate the remaining space for expanded columns/rows
|
||||
Size2 remaining_space = get_size();
|
||||
for (Map<int, int>::Element *E = col_minw.front(); E; E = E->next()) {
|
||||
ms.width += E->get();
|
||||
if (col_expanded.has(E->key()))
|
||||
expand_cols++;
|
||||
if (!col_expanded.has(E->key()))
|
||||
remaining_space.width -= E->get();
|
||||
}
|
||||
|
||||
for (Map<int, int>::Element *E = row_minh.front(); E; E = E->next()) {
|
||||
ms.height += E->get();
|
||||
if (row_expanded.has(E->key()))
|
||||
expand_rows++;
|
||||
if (!row_expanded.has(E->key()))
|
||||
remaining_space.height -= E->get();
|
||||
}
|
||||
remaining_space.height -= vsep * (max_row - 1);
|
||||
remaining_space.width -= hsep * (max_col - 1);
|
||||
|
||||
bool can_fit = false;
|
||||
while (!can_fit) {
|
||||
// Check if all minwidth constraints are ok if we use the remaining space
|
||||
can_fit = true;
|
||||
int max_index = 0;
|
||||
for (Set<int>::Element *E = col_expanded.front(); E; E = E->next()) {
|
||||
if (col_minw[E->get()] > col_minw[max_index]) {
|
||||
max_index = col_minw[E->get()];
|
||||
}
|
||||
if (can_fit && (remaining_space.width / col_expanded.size()) < col_minw[E->get()]) {
|
||||
can_fit = false;
|
||||
}
|
||||
}
|
||||
|
||||
// If not, the column with maximum minwidth is not expanded
|
||||
if (!can_fit) {
|
||||
col_expanded.erase(max_index);
|
||||
remaining_space.width -= col_minw[max_index];
|
||||
}
|
||||
}
|
||||
|
||||
ms.height += vsep * max_row;
|
||||
ms.width += hsep * max_col;
|
||||
can_fit = false;
|
||||
while (!can_fit) {
|
||||
// Check if all minwidth constraints are ok if we use the remaining space
|
||||
can_fit = true;
|
||||
int max_index = 0;
|
||||
for (Set<int>::Element *E = row_expanded.front(); E; E = E->next()) {
|
||||
if (row_minh[E->get()] > row_minh[max_index]) {
|
||||
max_index = row_minh[E->get()];
|
||||
}
|
||||
if (can_fit && (remaining_space.height / row_expanded.size()) < row_minh[E->get()]) {
|
||||
can_fit = false;
|
||||
}
|
||||
}
|
||||
|
||||
int row_expand = expand_rows ? (size.y - ms.y) / expand_rows : 0;
|
||||
int col_expand = expand_cols ? (size.x - ms.x) / expand_cols : 0;
|
||||
// If not, the row with maximum minwidth is not expanded
|
||||
if (!can_fit) {
|
||||
row_expanded.erase(max_index);
|
||||
remaining_space.height -= row_minh[max_index];
|
||||
}
|
||||
}
|
||||
|
||||
// Finally, fit the nodes
|
||||
int col_expand = remaining_space.width / col_expanded.size();
|
||||
int row_expand = remaining_space.height / row_expanded.size();
|
||||
|
||||
int col_ofs = 0;
|
||||
int row_ofs = 0;
|
||||
idx = 0;
|
||||
|
||||
for (int i = 0; i < get_child_count(); i++) {
|
||||
|
||||
Control *c = Object::cast_to<Control>(get_child(i));
|
||||
if (!c || !c->is_visible_in_tree())
|
||||
continue;
|
||||
int row = idx / columns;
|
||||
int col = idx % columns;
|
||||
int row = i / columns;
|
||||
int col = i % columns;
|
||||
|
||||
if (col == 0) {
|
||||
col_ofs = 0;
|
||||
if (row > 0 && row_minh.has(row - 1))
|
||||
row_ofs += row_minh[row - 1] + vsep + (row_expanded.has(row - 1) ? row_expand : 0);
|
||||
if (row > 0)
|
||||
row_ofs += ((row_expanded.has(row - 1)) ? row_expand : row_minh[row - 1]) + vsep;
|
||||
}
|
||||
|
||||
Size2 s;
|
||||
if (col_minw.has(col))
|
||||
s.width = col_minw[col];
|
||||
if (row_minh.has(row))
|
||||
s.height = row_minh[row];
|
||||
|
||||
if (row_expanded.has(row))
|
||||
s.height += row_expand;
|
||||
if (col_expanded.has(col))
|
||||
s.width += col_expand;
|
||||
|
||||
Point2 p(col_ofs, row_ofs);
|
||||
Size2 s((col_expanded.has(col)) ? col_expand : col_minw[col], (row_expanded.has(row)) ? row_expand : row_minh[row]);
|
||||
|
||||
//print_line("col: "+itos(col)+" row: "+itos(row)+" col_ofs: "+itos(col_ofs)+" row_ofs: "+itos(row_ofs));
|
||||
fit_child_in_rect(c, Rect2(p, s));
|
||||
//print_line("col: "+itos(col)+" row: "+itos(row)+" rect: "+Rect2(p,s));
|
||||
|
||||
if (col_minw.has(col)) {
|
||||
col_ofs += col_minw[col] + hsep + (col_expanded.has(col) ? col_expand : 0);
|
||||
}
|
||||
|
||||
idx++;
|
||||
col_ofs += s.width + hsep;
|
||||
}
|
||||
|
||||
} break;
|
||||
|
|
|
|||
|
|
@ -61,127 +61,69 @@ Control *SplitContainer::_getch(int p_idx) const {
|
|||
}
|
||||
|
||||
void SplitContainer::_resort() {
|
||||
|
||||
/* First pass, determine minimum size AND amount of stretchable elements */
|
||||
|
||||
int axis = vertical ? 1 : 0;
|
||||
|
||||
bool has_first = _getch(0);
|
||||
bool has_second = _getch(1);
|
||||
|
||||
if (!has_first && !has_second) {
|
||||
return;
|
||||
} else if (!(has_first && has_second)) {
|
||||
if (has_first)
|
||||
fit_child_in_rect(_getch(0), Rect2(Point2(), get_size()));
|
||||
else
|
||||
fit_child_in_rect(_getch(1), Rect2(Point2(), get_size()));
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
Control *first = _getch(0);
|
||||
Control *second = _getch(1);
|
||||
|
||||
bool ratiomode = false;
|
||||
bool expand_first_mode = false;
|
||||
|
||||
if (vertical) {
|
||||
|
||||
ratiomode = first->get_v_size_flags() & SIZE_EXPAND && second->get_v_size_flags() & SIZE_EXPAND;
|
||||
expand_first_mode = first->get_v_size_flags() & SIZE_EXPAND && !(second->get_v_size_flags() & SIZE_EXPAND);
|
||||
} else {
|
||||
|
||||
ratiomode = first->get_h_size_flags() & SIZE_EXPAND && second->get_h_size_flags() & SIZE_EXPAND;
|
||||
expand_first_mode = first->get_h_size_flags() & SIZE_EXPAND && !(second->get_h_size_flags() & SIZE_EXPAND);
|
||||
// If we have only one element
|
||||
if (!first || !second) {
|
||||
if (first) {
|
||||
fit_child_in_rect(_getch(0), Rect2(Point2(), get_size()));
|
||||
} else if (second) {
|
||||
fit_child_in_rect(_getch(1), Rect2(Point2(), get_size()));
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
int sep = get_constant("separation");
|
||||
Ref<Texture> g = get_icon("grabber");
|
||||
// Determine expanded children
|
||||
bool first_expanded = false;
|
||||
bool second_expanded = false;
|
||||
if (vertical) {
|
||||
first_expanded = first->get_v_size_flags() & SIZE_EXPAND;
|
||||
second_expanded = second->get_v_size_flags() & SIZE_EXPAND;
|
||||
} else {
|
||||
first_expanded = first->get_h_size_flags() & SIZE_EXPAND;
|
||||
second_expanded = second->get_h_size_flags() & SIZE_EXPAND;
|
||||
}
|
||||
|
||||
// Determine the separation between items
|
||||
Ref<Texture> g = get_icon("grabber");
|
||||
int sep = get_constant("separation");
|
||||
if (dragger_visibility == DRAGGER_HIDDEN_COLLAPSED) {
|
||||
sep = 0;
|
||||
} else {
|
||||
sep = MAX(sep, vertical ? g->get_height() : g->get_width());
|
||||
}
|
||||
|
||||
int total = vertical ? get_size().height : get_size().width;
|
||||
|
||||
total -= sep;
|
||||
|
||||
int minimum = 0;
|
||||
|
||||
// Compute the minimum size
|
||||
Size2 ms_first = first->get_combined_minimum_size();
|
||||
Size2 ms_second = second->get_combined_minimum_size();
|
||||
|
||||
if (vertical) {
|
||||
minimum = ms_first.height + ms_second.height;
|
||||
float ratio = first->get_stretch_ratio() / (first->get_stretch_ratio() + second->get_stretch_ratio());
|
||||
|
||||
int no_offset_middle_sep = 0;
|
||||
if (first_expanded && second_expanded) {
|
||||
no_offset_middle_sep = get_size()[axis] * ratio - sep / 2;
|
||||
} else if (first_expanded) {
|
||||
no_offset_middle_sep = get_size()[axis] - ms_second[axis] - sep;
|
||||
} else {
|
||||
minimum = ms_first.width + ms_second.width;
|
||||
no_offset_middle_sep = ms_first[axis];
|
||||
}
|
||||
|
||||
int available = total - minimum;
|
||||
if (available < 0)
|
||||
available = 0;
|
||||
|
||||
middle_sep = 0;
|
||||
|
||||
if (collapsed) {
|
||||
|
||||
if (ratiomode) {
|
||||
|
||||
int first_ratio = first->get_stretch_ratio();
|
||||
int second_ratio = second->get_stretch_ratio();
|
||||
|
||||
float ratio = float(first_ratio) / (first_ratio + second_ratio);
|
||||
|
||||
middle_sep = ms_first[axis] + available * ratio;
|
||||
|
||||
} else if (expand_first_mode) {
|
||||
|
||||
middle_sep = get_size()[axis] - ms_second[axis] - sep;
|
||||
} else {
|
||||
|
||||
middle_sep = ms_first[axis];
|
||||
}
|
||||
} else if (ratiomode) {
|
||||
|
||||
int first_ratio = first->get_stretch_ratio();
|
||||
int second_ratio = second->get_stretch_ratio();
|
||||
|
||||
float ratio = float(first_ratio) / (first_ratio + second_ratio);
|
||||
|
||||
if (expand_ofs < -(available * ratio))
|
||||
expand_ofs = -(available * ratio);
|
||||
else if (expand_ofs > (available * (1.0 - ratio)))
|
||||
expand_ofs = (available * (1.0 - ratio));
|
||||
|
||||
middle_sep = ms_first[axis] + available * ratio + expand_ofs;
|
||||
} else if (expand_first_mode) {
|
||||
|
||||
if (expand_ofs > 0)
|
||||
expand_ofs = 0;
|
||||
else if (expand_ofs < -available)
|
||||
expand_ofs = -available;
|
||||
|
||||
middle_sep = get_size()[axis] - ms_second[axis] - sep + expand_ofs;
|
||||
} else {
|
||||
|
||||
if (expand_ofs < 0)
|
||||
expand_ofs = 0;
|
||||
else if (expand_ofs > available)
|
||||
expand_ofs = available;
|
||||
|
||||
middle_sep = ms_first[axis] + expand_ofs;
|
||||
middle_sep = no_offset_middle_sep;
|
||||
middle_sep += (collapsed) ? 0 : split_offset;
|
||||
middle_sep = MIN(middle_sep, get_size()[axis] - ms_second[axis] - sep);
|
||||
middle_sep = MAX(middle_sep, ms_first[axis]);
|
||||
if (!collapsed) {
|
||||
split_offset = middle_sep - no_offset_middle_sep;
|
||||
}
|
||||
|
||||
if (vertical) {
|
||||
|
||||
fit_child_in_rect(first, Rect2(Point2(0, 0), Size2(get_size().width, middle_sep)));
|
||||
int sofs = middle_sep + sep;
|
||||
fit_child_in_rect(second, Rect2(Point2(0, sofs), Size2(get_size().width, get_size().height - sofs)));
|
||||
} else {
|
||||
|
||||
fit_child_in_rect(first, Rect2(Point2(0, 0), Size2(middle_sep, get_size().height)));
|
||||
int sofs = middle_sep + sep;
|
||||
fit_child_in_rect(second, Rect2(Point2(sofs, 0), Size2(get_size().width - sofs, get_size().height)));
|
||||
|
|
@ -290,7 +232,7 @@ void SplitContainer::_gui_input(const Ref<InputEvent> &p_event) {
|
|||
|
||||
dragging = true;
|
||||
drag_from = mb->get_position().y;
|
||||
drag_ofs = expand_ofs;
|
||||
drag_ofs = split_offset;
|
||||
}
|
||||
} else {
|
||||
|
||||
|
|
@ -298,7 +240,7 @@ void SplitContainer::_gui_input(const Ref<InputEvent> &p_event) {
|
|||
|
||||
dragging = true;
|
||||
drag_from = mb->get_position().x;
|
||||
drag_ofs = expand_ofs;
|
||||
drag_ofs = split_offset;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
|
@ -312,7 +254,7 @@ void SplitContainer::_gui_input(const Ref<InputEvent> &p_event) {
|
|||
|
||||
if (mm.is_valid() && dragging) {
|
||||
|
||||
expand_ofs = drag_ofs + ((vertical ? mm->get_position().y : mm->get_position().x) - drag_from);
|
||||
split_offset = drag_ofs + ((vertical ? mm->get_position().y : mm->get_position().x) - drag_from);
|
||||
queue_sort();
|
||||
emit_signal("dragged", get_split_offset());
|
||||
}
|
||||
|
|
@ -343,16 +285,16 @@ Control::CursorShape SplitContainer::get_cursor_shape(const Point2 &p_pos) const
|
|||
|
||||
void SplitContainer::set_split_offset(int p_offset) {
|
||||
|
||||
if (expand_ofs == p_offset)
|
||||
if (split_offset == p_offset)
|
||||
return;
|
||||
|
||||
expand_ofs = p_offset;
|
||||
split_offset = p_offset;
|
||||
queue_sort();
|
||||
}
|
||||
|
||||
int SplitContainer::get_split_offset() const {
|
||||
|
||||
return expand_ofs;
|
||||
return split_offset;
|
||||
}
|
||||
|
||||
void SplitContainer::set_collapsed(bool p_collapsed) {
|
||||
|
|
@ -407,7 +349,7 @@ void SplitContainer::_bind_methods() {
|
|||
SplitContainer::SplitContainer(bool p_vertical) {
|
||||
|
||||
mouse_inside = false;
|
||||
expand_ofs = 0;
|
||||
split_offset = 0;
|
||||
middle_sep = 0;
|
||||
vertical = p_vertical;
|
||||
dragging = false;
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ public:
|
|||
|
||||
private:
|
||||
bool vertical;
|
||||
int expand_ofs;
|
||||
int split_offset;
|
||||
int middle_sep;
|
||||
bool dragging;
|
||||
int drag_from;
|
||||
|
|
|
|||
Loading…
Reference in New Issue