pengtaihao
/
com.unity.uiextensions.nosample
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Edited SetLayoutVertical() to avoid unnecessary recomputation of maxPreferredHeightInRow 

--HG--
branch : develop_5.3
release
Rahul Raman 2016-12-27 20:16:50 +00:00
parent bbd5102246
commit 81dd26b5ef
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Scripts/Layout/TableLayoutGroup.cs
View File

@ -6,7 +6,7 @@ namespace UnityEngine.UI.Extensions
/// <summary> /// <summary>
/// Arranges child objects into a non-uniform grid, with fixed column widths and flexible row heights /// Arranges child objects into a non-uniform grid, with fixed column widths and flexible row heights
/// </summary> /// </summary>
public class TableLayout : LayoutGroup public class TableLayoutGroup : LayoutGroup
{ {
public enum Corner public enum Corner
{ {
@ -190,6 +190,8 @@ namespace UnityEngine.UI.Extensions
float requiredHeightWithoutPadding = 0; float requiredHeightWithoutPadding = 0;
float[] maxPreferredHeightInRows = new float[rowCount];
for (int i = 0; i < rowCount; i++) for (int i = 0; i < rowCount; i++)
{ {
float maxPreferredHeightInRow = 0; float maxPreferredHeightInRow = 0;
@ -205,6 +207,7 @@ namespace UnityEngine.UI.Extensions
} }
maxPreferredHeightInRow = Mathf.Max(minimumRowHeight, maxPreferredHeightInRow); maxPreferredHeightInRow = Mathf.Max(minimumRowHeight, maxPreferredHeightInRow);
maxPreferredHeightInRows[i] = maxPreferredHeightInRow;
requiredHeightWithoutPadding += maxPreferredHeightInRow; requiredHeightWithoutPadding += maxPreferredHeightInRow;
requiredHeightWithoutPadding += rowSpacing; requiredHeightWithoutPadding += rowSpacing;
} }
@ -225,7 +228,10 @@ namespace UnityEngine.UI.Extensions
{ {
float positionX = startOffset.x; float positionX = startOffset.x;
float maxPreferredHeightInRow = 0; float sizeYOfRect = maxPreferredHeightInRows[i] + rowSpacing;
if (cornerY == 1)
positionY -= sizeYOfRect;
for (int j = 0; j < columnCount; j++) for (int j = 0; j < columnCount; j++)
{ {
@ -240,27 +246,10 @@ namespace UnityEngine.UI.Extensions
positionX -= sizeXOfRect; positionX -= sizeXOfRect;
SetChildAlongAxis(rectChildren[childIndex], 0, positionX, columnWidths[j]); SetChildAlongAxis(rectChildren[childIndex], 0, positionX, columnWidths[j]);
SetChildAlongAxis(rectChildren[childIndex], 1, positionY, maxPreferredHeightInRows[i]);
if (cornerX != 1) if (cornerX != 1)
positionX += sizeXOfRect; positionX += sizeXOfRect;
maxPreferredHeightInRow = Mathf.Max(LayoutUtility.GetPreferredHeight(rectChildren[childIndex]), maxPreferredHeightInRow);
}
maxPreferredHeightInRow = Mathf.Max(minimumRowHeight, maxPreferredHeightInRow);
float sizeYOfRect = maxPreferredHeightInRow + rowSpacing;
if (cornerY == 1)
positionY -= sizeYOfRect;
for (int j = 0; j < columnCount; j++)
{
int childIndex = (i * columnCount) + j;
if (childIndex >= rectChildren.Count)
break;
SetChildAlongAxis(rectChildren[childIndex], 1, positionY, maxPreferredHeightInRow);
} }
if (cornerY != 1) if (cornerY != 1)