Ellpeck/MLEM
1
0
Fork 0
mirror of https://github.com/Ellpeck/MLEM.git synced 2024-11-24 21:48:35 +01:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: Ellpeck:cf48fc372e6fec17922cf6705fbe2f3a0ad5961b
Branches Tags
Ellpeck:main
Ellpeck:7.1.1
Ellpeck:7.1.0
Ellpeck:7.0.0
Ellpeck:6.3.1
Ellpeck:6.3.0
..
compare: Ellpeck:778d416774e938e92b03de8607e04a1e61b334be
Branches Tags
Ellpeck:main
Ellpeck:7.1.1
Ellpeck:7.1.0
Ellpeck:7.0.0
Ellpeck:6.3.1
Ellpeck:6.3.0

2 commits
cf48fc372e ... 778d416774

Author SHA1 Message Date
Ell
778d416774 mark panel's relevant children dirty when the render target changes 2021-11-05 23:28:32 +01:00
Ell
543201d178 ensure that relevant panel children are updated when children are changed 2021-11-05 23:22:39 +01:00
1 changed files with 22 additions and 19 deletions
Show stats Expand all files Collapse all files

41
MLEM.Ui/Elements/Panel.cs
View file

@ -128,7 +128,7 @@ namespace MLEM.Ui.Elements {
public override void ForceUpdateSortedChildren() { public override void ForceUpdateSortedChildren() {
base.ForceUpdateSortedChildren(); base.ForceUpdateSortedChildren();
if (this.scrollOverflow) if (this.scrollOverflow)
this.relevantChildrenDirty = true; this.ForceUpdateRelevantChildren();
} }
/// <inheritdoc /> /// <inheritdoc />
@ -147,24 +147,8 @@ namespace MLEM.Ui.Elements {
protected override IList<Element> GetRelevantChildren() { protected override IList<Element> GetRelevantChildren() {
var relevant = base.GetRelevantChildren(); var relevant = base.GetRelevantChildren();
if (this.scrollOverflow) { if (this.scrollOverflow) {
if (this.relevantChildrenDirty) { if (this.relevantChildrenDirty)
this.relevantChildrenDirty = false; this.ForceUpdateRelevantChildren();
var visible = this.GetRenderTargetArea();
this.relevantChildren.Clear();
foreach (var child in this.SortedChildren) {
if (child.Area.Intersects(visible)) {
this.relevantChildren.Add(child);
} else {
foreach (var c in child.GetChildren(regardGrandchildren: true)) {
if (c.Area.Intersects(visible)) {
this.relevantChildren.Add(child);
break;
}
}
}
}
}
relevant = this.relevantChildren; relevant = this.relevantChildren;
} }
return relevant; return relevant;
@ -251,6 +235,7 @@ namespace MLEM.Ui.Elements {
if (this.renderTarget != null) if (this.renderTarget != null)
this.renderTarget.Dispose(); this.renderTarget.Dispose();
this.renderTarget = targetArea.IsEmpty ? null : new RenderTarget2D(this.System.Game.GraphicsDevice, targetArea.Width, targetArea.Height); this.renderTarget = targetArea.IsEmpty ? null : new RenderTarget2D(this.System.Game.GraphicsDevice, targetArea.Width, targetArea.Height);
this.relevantChildrenDirty = true;
} }
} }
@ -272,5 +257,23 @@ namespace MLEM.Ui.Elements {
this.ScrollBar.PositionOffset = new Vector2(-this.ScrollerSize.Value.X - 1, 0); this.ScrollBar.PositionOffset = new Vector2(-this.ScrollerSize.Value.X - 1, 0);
} }
private void ForceUpdateRelevantChildren() {
this.relevantChildrenDirty = false;
this.relevantChildren.Clear();
var visible = this.GetRenderTargetArea();
foreach (var child in this.SortedChildren) {
if (child.Area.Intersects(visible)) {
this.relevantChildren.Add(child);
} else {
foreach (var c in child.GetChildren(regardGrandchildren: true)) {
if (c.Area.Intersects(visible)) {
this.relevantChildren.Add(child);
break;
}
}
}
}
}
} }
} }