Ellpeck/MLEM
1
0
Fork 0
mirror of https://github.com/Ellpeck/MLEM.git synced 2024-06-16 10:44:32 +02:00
Code Issues Projects Releases Wiki Activity

allow for ui element removal during its update

Browse source
This commit is contained in:
Ellpeck 2019-12-05 14:59:53 +01:00
parent bffcab3130
commit 0c74dfc38e
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
MLEM.Ui/Elements/Element.cs
View file

@ -442,7 +442,8 @@ namespace MLEM.Ui.Elements {
this.System.OnElementUpdated?.Invoke(this, time); this.System.OnElementUpdated?.Invoke(this, time);
foreach (var child in this.GetRelevantChildren()) foreach (var child in this.GetRelevantChildren())
child.Update(time); if (child.System != null)
child.Update(time);
} }
public virtual void Draw(GameTime time, SpriteBatch batch, float alpha, BlendState blendState, SamplerState samplerState, Matrix matrix) { public virtual void Draw(GameTime time, SpriteBatch batch, float alpha, BlendState blendState, SamplerState samplerState, Matrix matrix) {

5
MLEM.Ui/UiSystem.cs
View file

@ -98,8 +98,9 @@ namespace MLEM.Ui {
public void Update(GameTime time) { public void Update(GameTime time) {
this.Controls.Update(); this.Controls.Update();
foreach (var root in this.rootElements) for (var i = this.rootElements.Count - 1; i >= 0; i--) {
root.Element.Update(time); this.rootElements[i].Element.Update(time);
}
} }
public void DrawEarly(GameTime time, SpriteBatch batch) { public void DrawEarly(GameTime time, SpriteBatch batch) {