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

Resolves #143 

Performance tweaked the existing Linq method and at the request of #143 , added a new array sort alternative.
pull/413/head
Simon Jackson 2017-06-10 14:33:12 +01:00
parent 6a29b9957e
commit 9ce211c5fc
1 changed files with 55 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
Scripts/Controls/ComboBox/AutoCompleteComboBox.cs
View File

@ -6,6 +6,12 @@ using System.Linq;
namespace UnityEngine.UI.Extensions namespace UnityEngine.UI.Extensions
{ {
public enum AutoCompleteSearchType
{
ArraySort,
Linq
}
[RequireComponent(typeof(RectTransform))] [RequireComponent(typeof(RectTransform))]
[AddComponentMenu("UI/Extensions/AutoComplete ComboBox")] [AddComponentMenu("UI/Extensions/AutoComplete ComboBox")]
public class AutoCompleteComboBox : MonoBehaviour public class AutoCompleteComboBox : MonoBehaviour
@ -94,7 +100,9 @@ namespace UnityEngine.UI.Extensions
public Color MatchingItemsRemainingTextColor = Color.black; public Color MatchingItemsRemainingTextColor = Color.black;
public Color NoItemsRemainingTextColor = Color.red; public Color NoItemsRemainingTextColor = Color.red;
private bool _selectionIsValid = false; public AutoCompleteSearchType autocompleteSearchType = AutoCompleteSearchType.Linq;
private bool _selectionIsValid = false;
[System.Serializable] [System.Serializable]
public class SelectionChangedEvent : UnityEngine.Events.UnityEvent<string, bool> { public class SelectionChangedEvent : UnityEngine.Events.UnityEvent<string, bool> {
@ -169,7 +177,7 @@ namespace UnityEngine.UI.Extensions
panelObjects = new Dictionary<string, GameObject>(); panelObjects = new Dictionary<string, GameObject>();
_prunedPanelItems = new List<string>(); _prunedPanelItems = new List<string>();
_panelItems = AvailableOptions.ToList(); _panelItems = new List<string>();
RebuildPanel(); RebuildPanel();
//RedrawPanel(); - causes an initialisation failure in U5 //RedrawPanel(); - causes an initialisation failure in U5
@ -212,15 +220,15 @@ namespace UnityEngine.UI.Extensions
{ {
//panel starts with all options //panel starts with all options
_panelItems.Clear(); _panelItems.Clear();
_prunedPanelItems.Clear();
panelObjects.Clear();
foreach (string option in AvailableOptions) foreach (string option in AvailableOptions)
{ {
_panelItems.Add(option.ToLower()); _panelItems.Add(option.ToLower());
} }
_panelItems.Sort();
_prunedPanelItems.Clear();
List<GameObject> itemObjs = new List<GameObject>(panelObjects.Values); List<GameObject> itemObjs = new List<GameObject>(panelObjects.Values);
panelObjects.Clear();
int indx = 0; int indx = 0;
while (itemObjs.Count < AvailableOptions.Count) while (itemObjs.Count < AvailableOptions.Count)
@ -396,24 +404,61 @@ namespace UnityEngine.UI.Extensions
private void PruneItems(string currText) private void PruneItems(string currText)
{ {
List<string> notToPrune = _panelItems.Where(x => x.ToLower().Contains(currText.ToLower())).ToList(); if (autocompleteSearchType == AutoCompleteSearchType.Linq)
List<string> toPrune = _panelItems.Except(notToPrune).ToList(); {
PruneItemsLinq(currText);
}
else
{
PruneItemsArray(currText);
}
}
private void PruneItemsLinq(string currText)
{
currText = currText.ToLower();
var toPrune = _panelItems.Where(x => !x.Contains(currText)).ToArray();
foreach (string key in toPrune) foreach (string key in toPrune)
{ {
// Debug.Log("pruning key " + key);
panelObjects[key].SetActive(false); panelObjects[key].SetActive(false);
_panelItems.Remove(key); _panelItems.Remove(key);
_prunedPanelItems.Add(key); _prunedPanelItems.Add(key);
} }
List<string> toAddBack = _prunedPanelItems.Where(x => x.ToLower().Contains(currText)).ToList(); var toAddBack = _prunedPanelItems.Where(x => x.Contains(currText)).ToArray();
foreach (string key in toAddBack) foreach (string key in toAddBack)
{ {
// Debug.Log("adding back key " + key);
panelObjects[key].SetActive(true); panelObjects[key].SetActive(true);
_panelItems.Add(key); _panelItems.Add(key);
_prunedPanelItems.Remove(key); _prunedPanelItems.Remove(key);
} }
} }
//Updated to not use Linq
private void PruneItemsArray(string currText)
{
string _currText = currText.ToLower();
for (int i = _panelItems.Count - 1; i >= 0; i--)
{
string _item = _panelItems[i];
if (!_item.Contains(_currText))
{
panelObjects[_panelItems[i]].SetActive(false);
_panelItems.RemoveAt(i);
_prunedPanelItems.Add(_item);
}
}
for (int i = _prunedPanelItems.Count - 1; i >= 0; i--)
{
string _item = _prunedPanelItems[i];
if (_item.Contains(_currText))
{
panelObjects[_prunedPanelItems[i]].SetActive(true);
_prunedPanelItems.RemoveAt(i);
_panelItems.Add(_item);
}
}
}
} }
} }