epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix frame end task race condition in ScrollPanelWidget

Browse Source
This commit is contained in:
Curtis Shmyr
2016-11-13 07:09:47 +00:00
committed by Paul Chote
parent 9d7413ab3d
commit 33e1a6b2dd
5 changed files with 60 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Game/Primitives/IObservableCollection.cs
View File

@@ -16,11 +16,11 @@ namespace OpenRA.Primitives
{
public interface IObservableCollection
{
event Action<object> OnAdd;
event Action<object> OnRemove;
event Action<int> OnRemoveAt;
event Action<object, object> OnSet;
event Action OnRefresh;
event Action<IObservableCollection, object> OnAdd;
event Action<IObservableCollection, object> OnRemove;
event Action<IObservableCollection, int> OnRemoveAt;
event Action<IObservableCollection, object, object> OnSet;
event Action<IObservableCollection> OnRefresh;
IEnumerable ObservedItems { get; }
}
}

18
OpenRA.Game/Primitives/ObservableCollection.cs
View File

@@ -18,15 +18,15 @@ namespace OpenRA.Primitives
{
public class ObservableCollection<T> : Collection<T>, IObservableCollection
{
public event Action<object> OnAdd = k => { };
public event Action<IObservableCollection, object> OnAdd = (x, k) => { };
// TODO Workaround for https://github.com/OpenRA/OpenRA/issues/6101
#pragma warning disable 67
public event Action<object> OnRemove = k => { };
public event Action<IObservableCollection, object> OnRemove = (x, k) => { };
#pragma warning restore
public event Action<int> OnRemoveAt = i => { };
public event Action<object, object> OnSet = (o, n) => { };
public event Action OnRefresh = () => { };
public event Action<IObservableCollection, int> OnRemoveAt = (x, i) => { };
public event Action<IObservableCollection, object, object> OnSet = (x, o, n) => { };
public event Action<IObservableCollection> OnRefresh = x => { };
public ObservableCollection() { }
public ObservableCollection(IList<T> list) : base(list) { }
@@ -35,25 +35,25 @@ namespace OpenRA.Primitives
{
var old = this[index];
base.SetItem(index, item);
OnSet(old, item);
OnSet(this, old, item);
}
protected override void InsertItem(int index, T item)
{
base.InsertItem(index, item);
OnAdd(item);
OnAdd(this, item);
}
protected override void ClearItems()
{
base.ClearItems();
OnRefresh();
OnRefresh(this);
}
protected override void RemoveItem(int index)
{
base.RemoveItem(index);
OnRemoveAt(index);
OnRemoveAt(this, index);
}
public IEnumerable ObservedItems

18
OpenRA.Game/Primitives/ObservableDictionary.cs
View File

@@ -33,19 +33,19 @@ namespace OpenRA.Primitives
{
protected IDictionary<TKey, TValue> innerDict;
public event Action<object> OnAdd = k => { };
public event Action<object> OnRemove = k => { };
public event Action<IObservableCollection, object> OnAdd = (x, k) => { };
public event Action<IObservableCollection, object> OnRemove = (x, k) => { };
// TODO Workaround for https://github.com/OpenRA/OpenRA/issues/6101
#pragma warning disable 67
public event Action<int> OnRemoveAt = i => { };
public event Action<object, object> OnSet = (o, n) => { };
public event Action<IObservableCollection, int> OnRemoveAt = (x, i) => { };
public event Action<IObservableCollection, object, object> OnSet = (x, o, n) => { };
#pragma warning restore
public event Action OnRefresh = () => { };
public event Action<IObservableCollection> OnRefresh = x => { };
protected void FireOnRefresh()
{
OnRefresh();
OnRefresh(this);
}
protected ObservableDictionary() { }
@@ -58,14 +58,14 @@ namespace OpenRA.Primitives
public virtual void Add(TKey key, TValue value)
{
innerDict.Add(key, value);
OnAdd(key);
OnAdd(this, key);
}
public bool Remove(TKey key)
{
var found = innerDict.Remove(key);
if (found)
OnRemove(key);
OnRemove(this, key);
return found;
}
@@ -91,7 +91,7 @@ namespace OpenRA.Primitives
public void Clear()
{
innerDict.Clear();
OnRefresh();
OnRefresh(this);
}
public int Count

24
OpenRA.Game/Primitives/ObservableList.cs
View File

@@ -19,19 +19,19 @@ namespace OpenRA.Primitives
{
protected IList<T> innerList;
public event Action<object> OnAdd = k => { };
public event Action<object> OnRemove = k => { };
public event Action<IObservableCollection, object> OnAdd = (x, k) => { };
public event Action<IObservableCollection, object> OnRemove = (x, k) => { };
// TODO Workaround for https://github.com/OpenRA/OpenRA/issues/6101
#pragma warning disable 67
public event Action<int> OnRemoveAt = i => { };
public event Action<object, object> OnSet = (o, n) => { };
public event Action<IObservableCollection, int> OnRemoveAt = (x, i) => { };
public event Action<IObservableCollection, object, object> OnSet = (x, o, n) => { };
#pragma warning restore
public event Action OnRefresh = () => { };
public event Action<IObservableCollection> OnRefresh = x => { };
protected void FireOnRefresh()
{
OnRefresh();
OnRefresh(this);
}
public ObservableList()
@@ -42,14 +42,14 @@ namespace OpenRA.Primitives
public virtual void Add(T item)
{
innerList.Add(item);
OnAdd(item);
OnAdd(this, item);
}
public bool Remove(T item)
{
var found = innerList.Remove(item);
if (found)
OnRemove(item);
OnRemove(this, item);
return found;
}
@@ -57,13 +57,13 @@ namespace OpenRA.Primitives
public void Clear()
{
innerList.Clear();
OnRefresh();
OnRefresh(this);
}
public void Insert(int index, T item)
{
innerList.Insert(index, item);
OnRefresh();
OnRefresh(this);
}
public int Count { get { return innerList.Count; } }
@@ -73,7 +73,7 @@ namespace OpenRA.Primitives
public void RemoveAt(int index)
{
innerList.RemoveAt(index);
OnRemoveAt(index);
OnRemoveAt(this, index);
}
public T this[int index]
@@ -87,7 +87,7 @@ namespace OpenRA.Primitives
{
var oldValue = innerList[index];
innerList[index] = value;
OnSet(oldValue, value);
OnSet(this, oldValue, value);
}
}