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

Merge branch 'master' of https://bitbucket.org/UnityUIExtensions/unity-ui-extensions

pull/413/head
Simon (Darkside) Jackson 2018-04-12 15:12:31 +01:00
parent 18a61b5ef5 2885d851d1
commit 8768fb6c8d
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Scripts/Controls/ReorderableList/ReorderableList.cs
View File

@ -66,6 +66,15 @@ namespace UnityEngine.UI.Extensions
} }
return canvas; return canvas;
} }
/// <summary>
/// Refresh related list content
/// </summary>
public void Refresh()
{
_listContent = ContentLayout.gameObject.AddComponent<ReorderableListContent>();
_listContent.Init(this);
}
private void Awake() private void Awake()
{ {
@ -85,8 +94,7 @@ namespace UnityEngine.UI.Extensions
return; return;
} }
_listContent = ContentLayout.gameObject.AddComponent<ReorderableListContent>(); Refresh();
_listContent.Init(this);
} }
#region Nested type: ReorderableListEventStruct #region Nested type: ReorderableListEventStruct

6
Scripts/Controls/ReorderableList/ReorderableListElement.cs
View File

@ -226,6 +226,10 @@ namespace UnityEngine.UI.Extensions
_draggingObject.SetSiblingIndex(_fakeElement.GetSiblingIndex()); _draggingObject.SetSiblingIndex(_fakeElement.GetSiblingIndex());
_reorderableList.OnElementAdded.Invoke(args); _reorderableList.OnElementAdded.Invoke(args);
// Force refreshing both lists because otherwise we get inappropriate FromList in ReorderableListEventStruct
_reorderableList.Refresh();
_currentReorderableListRaycasted.Refresh();
if(!isValid) throw new Exception("It's too late to cancel the Transfer! Do so in OnElementDropped!"); if(!isValid) throw new Exception("It's too late to cancel the Transfer! Do so in OnElementDropped!");
@ -251,7 +255,7 @@ namespace UnityEngine.UI.Extensions
} }
} }
} }
//Delete fake element //Delete fake element
if (_fakeElement != null) if (_fakeElement != null)
Destroy(_fakeElement.gameObject); Destroy(_fakeElement.gameObject);