pengtaihao
/
com.unity.uiextensions
mirror of https://github.com/Unity-UI-Extensions/com.unity.uiextensions
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Modified Vertical layout functions to use nested loops to minimize condition test failures 

--HG--
branch : develop_5.3
pull/413/head
Rahul Raman 2016-12-31 09:12:29 +00:00
parent 909589e544
commit 66cbf0da23
1 changed files with 42 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
Scripts/Layout/TableLayoutGroup.cs
View File

@ -100,7 +100,7 @@ namespace UnityEngine.UI.Extensions
SetProperty(ref rowSpacing, value); SetProperty(ref rowSpacing, value);
} }
} }
// Temporarily stores data generated during the execution CalculateLayoutInputVertical for use in SetLayoutVertical // Temporarily stores data generated during the execution CalculateLayoutInputVertical for use in SetLayoutVertical
private float[] preferredRowHeights; private float[] preferredRowHeights;
@ -109,7 +109,7 @@ namespace UnityEngine.UI.Extensions
base.CalculateLayoutInputHorizontal(); base.CalculateLayoutInputHorizontal();
float horizontalSize = padding.horizontal; float horizontalSize = padding.horizontal;
// We calculate the actual cell count for cases where the number of children is lesser than the number of columns // We calculate the actual cell count for cases where the number of children is lesser than the number of columns
int actualCellCount = Mathf.Min(rectChildren.Count, columnWidths.Length); int actualCellCount = Mathf.Min(rectChildren.Count, columnWidths.Length);
@ -148,30 +148,28 @@ namespace UnityEngine.UI.Extensions
float maxMinimumHeightInRow = 0; float maxMinimumHeightInRow = 0;
float maxPreferredHeightInRow = 0; float maxPreferredHeightInRow = 0;
for (int i = 0; i < rectChildren.Count; i++) for (int i = 0; i < rowCount; i++)
{ {
int currentRowIndex = i / columnCount; maxMinimumHeightInRow = minimumRowHeight;
int currentColumnIndex = i % columnCount; maxPreferredHeightInRow = minimumRowHeight;
// If it's the first cell in the row, reset heights for the row for (int j = 0; j < columnCount; j++)
if (currentColumnIndex == 0)
{ {
maxMinimumHeightInRow = minimumRowHeight; int childIndex = (i * columnCount) + j;
maxPreferredHeightInRow = minimumRowHeight;
// Safeguard against tables with incomplete rows
if (childIndex == rectChildren.Count)
break;
maxPreferredHeightInRow = Mathf.Max(LayoutUtility.GetPreferredHeight(rectChildren[childIndex]), maxPreferredHeightInRow);
maxMinimumHeightInRow = Mathf.Max(LayoutUtility.GetMinHeight(rectChildren[childIndex]), maxMinimumHeightInRow);
} }
maxPreferredHeightInRow = Mathf.Max(LayoutUtility.GetPreferredHeight(rectChildren[i]), maxPreferredHeightInRow); totalMinHeight += maxMinimumHeightInRow;
maxMinimumHeightInRow = Mathf.Max(LayoutUtility.GetMinHeight(rectChildren[i]), maxMinimumHeightInRow); totalPreferredHeight += maxPreferredHeightInRow;
// If it's the last cell in the row, or if it's the last cell and the row is incomplete, set calculated heights // Add calculated row height to a commonly accessible array for reuse in SetLayoutVertical()
if (currentColumnIndex == columnCount - 1 || (i == rectChildren.Count - 1 && currentRowIndex == rowCount - 1)) preferredRowHeights[i] = maxPreferredHeightInRow;
{
totalMinHeight += maxMinimumHeightInRow;
totalPreferredHeight += maxPreferredHeightInRow;
// Add calculated row height to a commonly accessible array for reuse in SetLayoutVertical()
preferredRowHeights[currentRowIndex] = maxPreferredHeightInRow;
}
} }
} }
else else
@ -199,7 +197,7 @@ namespace UnityEngine.UI.Extensions
float startOffset = 0; float startOffset = 0;
float requiredSizeWithoutPadding = 0; float requiredSizeWithoutPadding = 0;
// We calculate the actual cell count for cases where the number of children is lesser than the number of columns // We calculate the actual cell count for cases where the number of children is lesser than the number of columns
int actualCellCount = Mathf.Min(rectChildren.Count, columnWidths.Length); int actualCellCount = Mathf.Min(rectChildren.Count, columnWidths.Length);
@ -242,46 +240,45 @@ namespace UnityEngine.UI.Extensions
{ {
int columnCount = columnWidths.Length; int columnCount = columnWidths.Length;
int rowCount = preferredRowHeights.Length; int rowCount = preferredRowHeights.Length;
int cornerY = (int)startCorner / 2; int cornerY = (int)startCorner / 2;
float startOffset = 0; float startOffset = 0;
float requiredSizeWithoutPadding = 0; float requiredSizeWithoutPadding = 0;
for (int i = 0; i < rowCount; i++)
{
requiredSizeWithoutPadding += preferredRowHeights[i];
requiredSizeWithoutPadding += rowSpacing;
}
requiredSizeWithoutPadding -= rowSpacing; for (int i = 0; i < rowCount; i++)
requiredSizeWithoutPadding += preferredRowHeights[i];
if (rowCount > 1)
requiredSizeWithoutPadding += (rowCount - 1) * rowSpacing;
startOffset = GetStartOffset(1, requiredSizeWithoutPadding); startOffset = GetStartOffset(1, requiredSizeWithoutPadding);
if (cornerY == 1) if (cornerY == 1)
startOffset += requiredSizeWithoutPadding; startOffset += requiredSizeWithoutPadding;
float positionY = startOffset; float positionY = startOffset;
for (int i = 0; i < rectChildren.Count; i++) for (int i = 0; i < rowCount; i++)
{ {
int currentRowIndex = i / columnCount; if (cornerY == 1)
int currentColumnIndex = i % columnCount; positionY -= preferredRowHeights[i];
// If it's the first cell in the row and start corner is one of the bottom corners, then modify positionY appropriately for (int j = 0; j < columnCount; j++)
if (currentColumnIndex == 0 && cornerY == 1)
positionY -= preferredRowHeights[currentRowIndex];
SetChildAlongAxis(rectChildren[i], 1, positionY, preferredRowHeights[currentRowIndex]);
// If it's the first last cell in the row, then modify positionY appropriately
if (currentColumnIndex == columnCount - 1)
{ {
if (cornerY == 1) int childIndex = (i * columnCount) + j;
positionY -= rowSpacing;
else // Safeguard against tables with incomplete rows
positionY += preferredRowHeights[currentRowIndex] + rowSpacing; if (childIndex == rectChildren.Count)
break;
SetChildAlongAxis(rectChildren[childIndex], 1, positionY, preferredRowHeights[i]);
} }
if (cornerY == 1)
positionY -= rowSpacing;
else
positionY += preferredRowHeights[i] + rowSpacing;
} }
// Set preferredRowHeights to null to free memory // Set preferredRowHeights to null to free memory