Ellpeck/MLEM
1
0
Fork 0
mirror of https://github.com/Ellpeck/MLEM.git synced 2024-06-25 22:21:42 +02:00
Code Issues Projects Releases Wiki Activity

made panels only draw and update their visible children

Browse source
This commit is contained in:
Ellpeck 2019-09-20 13:48:49 +02:00
parent c5170917fb
commit a048daefbf
2 changed files with 43 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -415,22 +415,26 @@ namespace MLEM.Ui.Elements {
yield return parent; yield return parent;
} }
protected virtual List<Element> GetRelevantChildren() {
return this.SortedChildren;
}
public virtual void Update(GameTime time) { public virtual void Update(GameTime time) {
foreach (var child in this.SortedChildren) foreach (var child in this.GetRelevantChildren())
child.Update(time); 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) {
this.System.OnElementDrawn?.Invoke(this, time, batch, alpha); this.System.OnElementDrawn?.Invoke(this, time, batch, alpha);
foreach (var child in this.SortedChildren) { foreach (var child in this.GetRelevantChildren()) {
if (!child.IsHidden) if (!child.IsHidden)
child.Draw(time, batch, alpha * child.DrawAlpha, blendState, samplerState, matrix); child.Draw(time, batch, alpha * child.DrawAlpha, blendState, samplerState, matrix);
} }
} }
public virtual void DrawEarly(GameTime time, SpriteBatch batch, float alpha, BlendState blendState, SamplerState samplerState, Matrix matrix) { public virtual void DrawEarly(GameTime time, SpriteBatch batch, float alpha, BlendState blendState, SamplerState samplerState, Matrix matrix) {
foreach (var child in this.SortedChildren) { foreach (var child in this.GetRelevantChildren()) {
if (!child.IsHidden) if (!child.IsHidden)
child.DrawEarly(time, batch, alpha * child.DrawAlpha, blendState, samplerState, matrix); child.DrawEarly(time, batch, alpha * child.DrawAlpha, blendState, samplerState, matrix);
} }
@ -439,8 +443,9 @@ namespace MLEM.Ui.Elements {
public virtual Element GetElementUnderPos(Point position) { public virtual Element GetElementUnderPos(Point position) {
if (this.IsHidden) if (this.IsHidden)
return null; return null;
for (var i = this.SortedChildren.Count - 1; i >= 0; i--) { var children = this.GetRelevantChildren();
var element = this.SortedChildren[i].GetElementUnderPos(position); for (var i = children.Count - 1; i >= 0; i--) {
var element = children[i].GetElementUnderPos(position);
if (element != null) if (element != null)
return element; return element;
} }

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

@ -1,4 +1,5 @@
using System; using System;
using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
@ -14,6 +15,8 @@ namespace MLEM.Ui.Elements {
public readonly ScrollBar ScrollBar; public readonly ScrollBar ScrollBar;
private readonly bool scrollOverflow; private readonly bool scrollOverflow;
private RenderTarget2D renderTarget; private RenderTarget2D renderTarget;
private readonly List<Element> relevantChildren = new List<Element>();
private bool relevantChildrenDirty;
public Panel(Anchor anchor, Vector2 size, Vector2 positionOffset, bool setHeightBasedOnChildren = false, bool scrollOverflow = false, Point? scrollerSize = null) : base(anchor, size) { public Panel(Anchor anchor, Vector2 size, Vector2 positionOffset, bool setHeightBasedOnChildren = false, bool scrollOverflow = false, Point? scrollerSize = null) : base(anchor, size) {
this.PositionOffset = positionOffset; this.PositionOffset = positionOffset;
@ -26,7 +29,7 @@ namespace MLEM.Ui.Elements {
var scrollSize = scrollerSize ?? Point.Zero; var scrollSize = scrollerSize ?? Point.Zero;
this.ScrollBar = new ScrollBar(Anchor.TopRight, new Vector2(scrollSize.X, 1), scrollSize.Y, 0) { this.ScrollBar = new ScrollBar(Anchor.TopRight, new Vector2(scrollSize.X, 1), scrollSize.Y, 0) {
StepPerScroll = 10, StepPerScroll = 10,
OnValueChanged = (element, value) => this.ForceChildrenScroll(), OnValueChanged = (element, value) => this.ScrollChildren(),
CanAutoAnchorsAttach = false, CanAutoAnchorsAttach = false,
AutoHideWhenEmpty = true AutoHideWhenEmpty = true
}; };
@ -61,7 +64,7 @@ namespace MLEM.Ui.Elements {
} }
base.ForceUpdateArea(); base.ForceUpdateArea();
this.ForceChildrenScroll(); this.ScrollChildren();
if (this.scrollOverflow) { if (this.scrollOverflow) {
// if there is only one child, then we have just the scroll bar // if there is only one child, then we have just the scroll bar
@ -84,12 +87,39 @@ namespace MLEM.Ui.Elements {
} }
} }
private void ForceChildrenScroll() { private void ScrollChildren() {
if (!this.scrollOverflow) if (!this.scrollOverflow)
return; return;
var offset = -this.ScrollBar.CurrentValue.Floor(); var offset = -this.ScrollBar.CurrentValue.Floor();
foreach (var child in this.GetChildren(c => c != this.ScrollBar, true)) foreach (var child in this.GetChildren(c => c != this.ScrollBar, true))
child.ScrollOffset = new Point(0, offset); child.ScrollOffset = new Point(0, offset);
this.relevantChildrenDirty = true;
}
public override void Update(GameTime time) {
if (this.relevantChildrenDirty) {
this.relevantChildrenDirty = false;
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;
}
}
}
}
}
base.Update(time);
}
protected override List<Element> GetRelevantChildren() {
return this.scrollOverflow ? this.relevantChildren : base.GetRelevantChildren();
} }
public override void Draw(GameTime time, SpriteBatch batch, float alpha, BlendState blendState, SamplerState samplerState, Matrix matrix) { public override void Draw(GameTime time, SpriteBatch batch, float alpha, BlendState blendState, SamplerState samplerState, Matrix matrix) {