Removed unneeded size calculation which caused some issues with mixed height/width children.
Resolves: https://github.com/Unity-UI-Extensions/com.unity.uiextensions/issues/380pull/413/head
parent
dced045001
commit
18ebf8121d
|
@ -166,7 +166,6 @@ namespace UnityEngine.UI.Extensions
|
||||||
childSize = LayoutUtility.GetPreferredSize (child, 0);
|
childSize = LayoutUtility.GetPreferredSize (child, 0);
|
||||||
childSize = Mathf.Min (childSize, workingSize);
|
childSize = Mathf.Min (childSize, workingSize);
|
||||||
childOtherSize = LayoutUtility.GetPreferredSize (child, 1);
|
childOtherSize = LayoutUtility.GetPreferredSize (child, 1);
|
||||||
childOtherSize = Mathf.Min (childOtherSize, workingSize);
|
|
||||||
} else if (startAxis == Axis.Vertical) {
|
} else if (startAxis == Axis.Vertical) {
|
||||||
if (invertOrder) {
|
if (invertOrder) {
|
||||||
index = IsRightAlign ? rectChildren.Count - 1 - i : i;
|
index = IsRightAlign ? rectChildren.Count - 1 - i : i;
|
||||||
|
@ -175,7 +174,6 @@ namespace UnityEngine.UI.Extensions
|
||||||
childSize = LayoutUtility.GetPreferredSize (child, 1);
|
childSize = LayoutUtility.GetPreferredSize (child, 1);
|
||||||
childSize = Mathf.Min (childSize, workingSize);
|
childSize = Mathf.Min (childSize, workingSize);
|
||||||
childOtherSize = LayoutUtility.GetPreferredSize (child, 0);
|
childOtherSize = LayoutUtility.GetPreferredSize (child, 0);
|
||||||
childOtherSize = Mathf.Min (childOtherSize, workingSize);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// If adding this element would exceed the bounds of the container,
|
// If adding this element would exceed the bounds of the container,
|
||||||
|
|
Loading…
Reference in New Issue