Allow virtual list to enable scrolling in two directions.

coldfox · Nov 24, 2016 · 2841ed6 · 2841ed6
1 parent 80abab2
commit 2841ed6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/Source/Scripts/UI/DragDropManager.cs b/Source/Scripts/UI/DragDropManager.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using FairyGUI;
 using UnityEngine;
 
 namespace FairyGUI

diff --git a/Source/Scripts/UI/GList.cs b/Source/Scripts/UI/GList.cs
@@ -1279,7 +1279,11 @@ void RefreshVirtualList(object param)
 						ch += _virtualItems[i].size.y + _lineGap;
 					if (ch > 0)
 						ch -= _lineGap;
-					cw = this.scrollPane.contentWidth;
+
+					for (int i = 0; i < _curLineItemCount; i++)
+						cw += _virtualItems[i].size.x + _columnGap;
+					if (cw > 0)
+						cw -= _columnGap;
 				}
 				else if (_layout == ListLayoutType.SingleRow || _layout == ListLayoutType.FlowVertical)
 				{
@@ -1288,6 +1292,11 @@ void RefreshVirtualList(object param)
 					if (cw > 0)
 						cw -= _columnGap;
 					ch = this.scrollPane.contentHeight;
+
+					for (int i = 0; i < _curLineItemCount; i++)
+						ch += _virtualItems[i].size.y + _lineGap;
+					if (ch > 0)
+						ch -= _lineGap;
 				}
 				else
 				{

diff --git a/Source/Scripts/UI/IUISource.cs b/Source/Scripts/UI/IUISource.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
+
 namespace FairyGUI
 {
 	/// <summary>