gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-10-14 15:52:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #64800 from KoBeWi/split_hax

Browse source 
Handle child control size changes in SplitContainer
This commit is contained in:
Rémi Verschelde 2022-08-24 09:50:46 +02:00 committed by GitHub
parent 854eb58074 19ad31b89f
commit c3a8ec3cbb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scene/gui/split_container.cpp
View file

@ -95,11 +95,16 @@ void SplitContainer::_resort() {
no_offset_middle_sep = ms_first[axis];
}
// Compute the final middle separation
// Compute the final middle separation.
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) {
int clamped_split_offset = CLAMP(split_offset, ms_first[axis] - no_offset_middle_sep, get_size()[axis] - ms_second[axis] - sep);
middle_sep = MAX(middle_sep, clamped_split_offset);
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;
if (should_clamp_split_offset) {
split_offset = clamped_split_offset;
should_clamp_split_offset = false;

1
scene/gui/split_container.h
View file

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