godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

-Many fixes to VisualScript, fixed property names, etc.

Browse Source 
-Added ability to set/get a field in GetSet, as well as assignment ops
-Added a Select node
-Fixed update bugs related to variable list and exported properties, closes #9458
This commit is contained in:
Juan Linietsky
2017-06-30 21:30:17 -03:00
parent e2e73ec906
commit 2a3e00c8c7
36 changed files with 1091 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scene/gui/split_container.cpp
View File

@@ -131,7 +131,12 @@ void SplitContainer::_resort() {
if (ratiomode) {
middle_sep = ms_first[axis] + available / 2;
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) {
@@ -144,12 +149,17 @@ void SplitContainer::_resort() {
} else if (ratiomode) {
if (expand_ofs < -(available / 2))
expand_ofs = -(available / 2);
else if (expand_ofs > (available / 2))
expand_ofs = (available / 2);
int first_ratio = first->get_stretch_ratio();
int second_ratio = second->get_stretch_ratio();
middle_sep = ms_first[axis] + available / 2 + expand_ofs;
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) {