godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert SplitContainer minimum size splitting changes (#64676 and #64800)

Browse Source 
This reverts commits 185b1a5bd3 and 19ad31b89f.

The original PR and its fixup still had regressions, so we're going back
to the drawing board to reattempt fixing #43749.

Fixes #64785.
Fixes #64851.
Fixes #64866.
This commit is contained in:
Rémi Verschelde 2022-08-26 15:53:26 +02:00
parent c8ef12a03a
commit ecfff5b75e
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scene/gui/split_container.cpp
View File

@ -97,16 +97,12 @@ void SplitContainer::_resort() {
// Compute the final middle separation. // Compute the final middle separation.
middle_sep = no_offset_middle_sep; middle_sep = no_offset_middle_sep;
if (prev_no_offset_middle_sep != INT_MAX) {
split_offset -= middle_sep - prev_no_offset_middle_sep;
}
prev_no_offset_middle_sep = middle_sep;
if (!collapsed) { if (!collapsed) {
int clamped_split_offset = CLAMP(split_offset, ms_first[axis] - no_offset_middle_sep, (get_size()[axis] - ms_second[axis] - sep) - no_offset_middle_sep); int clamped_split_offset = CLAMP(split_offset, ms_first[axis] - no_offset_middle_sep, (get_size()[axis] - ms_second[axis] - sep) - no_offset_middle_sep);
middle_sep += clamped_split_offset; middle_sep += clamped_split_offset;
if (should_clamp_split_offset) { if (should_clamp_split_offset) {
split_offset = clamped_split_offset; split_offset = clamped_split_offset;
should_clamp_split_offset = false; should_clamp_split_offset = false;
} }
} }

1
scene/gui/split_container.h
View File

@ -47,7 +47,6 @@ private:
bool should_clamp_split_offset = false; bool should_clamp_split_offset = false;
int split_offset = 0; int split_offset = 0;
int middle_sep = 0; int middle_sep = 0;
int prev_no_offset_middle_sep = INT_MAX;
bool vertical = false; bool vertical = false;
bool dragging = false; bool dragging = false;
int drag_from = 0; int drag_from = 0;