Ellpeck/MLEM
1
0
Fork 0
mirror of https://github.com/Ellpeck/MLEM.git synced 2024-11-22 20:58:34 +01:00
Code Issues Projects Releases Wiki Activity

cleaned up changes from f1d686f0c0

Browse source
This commit is contained in:
Ellpeck 2020-07-16 15:55:55 +02:00
parent f94802271b
commit 02cd074a3c
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -395,8 +395,6 @@ namespace MLEM.Ui.Elements {
this.anchor = anchor; this.anchor = anchor;
this.size = size; this.size = size;
// force BeginImpl to be reset to the default
this.BeginImpl = null;
this.OnMouseEnter += element => this.IsMouseOver = true; this.OnMouseEnter += element => this.IsMouseOver = true;
this.OnMouseExit += element => this.IsMouseOver = false; this.OnMouseExit += element => this.IsMouseOver = false;
this.OnTouchEnter += element => this.IsMouseOver = true; this.OnTouchEnter += element => this.IsMouseOver = true;
@ -833,7 +831,7 @@ namespace MLEM.Ui.Elements {
/// <param name="blendState">The blend state that is used for drawing</param> /// <param name="blendState">The blend state that is used for drawing</param>
/// <param name="samplerState">The sampler state that is used for drawing</param> /// <param name="samplerState">The sampler state that is used for drawing</param>
/// <param name="matrix">The transformation matrix that is used for drawing</param> /// <param name="matrix">The transformation matrix that is used for drawing</param>
public void DrawAll(GameTime time, SpriteBatch batch, float alpha, BlendState blendState, SamplerState samplerState, Matrix matrix) { public void DrawTransformed(GameTime time, SpriteBatch batch, float alpha, BlendState blendState, SamplerState samplerState, Matrix matrix) {
var transform = this.Transform ?? this.TransformGetter(this, time, matrix); var transform = this.Transform ?? this.TransformGetter(this, time, matrix);
var customDraw = this.BeginImpl != null || transform != Matrix.Identity; var customDraw = this.BeginImpl != null || transform != Matrix.Identity;
var mat = matrix * transform; var mat = matrix * transform;
@ -874,7 +872,7 @@ namespace MLEM.Ui.Elements {
foreach (var child in this.GetRelevantChildren()) { foreach (var child in this.GetRelevantChildren()) {
if (!child.IsHidden) if (!child.IsHidden)
child.DrawAll(time, batch, alpha * child.DrawAlpha, blendState, samplerState, matrix); child.DrawTransformed(time, batch, alpha * child.DrawAlpha, blendState, samplerState, matrix);
} }
} }
@ -1011,7 +1009,7 @@ namespace MLEM.Ui.Elements {
public delegate Element GamepadNextElementCallback(Direction2 dir, Element usualNext); public delegate Element GamepadNextElementCallback(Direction2 dir, Element usualNext);
/// <summary> /// <summary>
/// A delegate method used for <see cref="CustomDrawGroup.BeginImpl"/> /// A delegate method used for <see cref="BeginImpl"/>
/// </summary> /// </summary>
/// <param name="element">The custom draw group</param> /// <param name="element">The custom draw group</param>
/// <param name="time">The game's time</param> /// <param name="time">The game's time</param>
@ -1023,7 +1021,7 @@ namespace MLEM.Ui.Elements {
public delegate void BeginDelegate(Element element, GameTime time, SpriteBatch batch, float alpha, BlendState blendState, SamplerState samplerState, Matrix matrix); public delegate void BeginDelegate(Element element, GameTime time, SpriteBatch batch, float alpha, BlendState blendState, SamplerState samplerState, Matrix matrix);
/// <summary> /// <summary>
/// A delegate method used for <see cref="CustomDrawGroup.TransformGetter"/> /// A delegate method used for <see cref="TransformGetter"/>
/// </summary> /// </summary>
/// <param name="element">The element whose transform to get</param> /// <param name="element">The element whose transform to get</param>
/// <param name="time">The game's time</param> /// <param name="time">The game's time</param>

2
MLEM.Ui/UiSystem.cs
View file

@ -260,7 +260,7 @@ namespace MLEM.Ui {
continue; continue;
batch.Begin(SpriteSortMode.Deferred, this.BlendState, this.SamplerState, null, null, null, root.Transform); batch.Begin(SpriteSortMode.Deferred, this.BlendState, this.SamplerState, null, null, null, root.Transform);
var alpha = this.DrawAlpha * root.Element.DrawAlpha; var alpha = this.DrawAlpha * root.Element.DrawAlpha;
root.Element.DrawAll(time, batch, alpha, this.BlendState, this.SamplerState, root.Transform); root.Element.DrawTransformed(time, batch, alpha, this.BlendState, this.SamplerState, root.Transform);
batch.End(); batch.End();
} }
} }