mirror of
https://github.com/Ellpeck/MLEM.git
synced 2024-10-31 21:00:51 +01:00
Added SetWidthBasedOnAspect and SetHeightBasedOnAspect to images
This commit is contained in:
parent
ae5d2b7a37
commit
294af052ae
4 changed files with 50 additions and 7 deletions
|
@ -31,6 +31,7 @@ Fixes
|
||||||
### MLEM.Ui
|
### MLEM.Ui
|
||||||
Additions
|
Additions
|
||||||
- Added UiControls.NavType, which stores the most recently used type of ui navigation
|
- Added UiControls.NavType, which stores the most recently used type of ui navigation
|
||||||
|
- Added SetWidthBasedOnAspect and SetHeightBasedOnAspect to images
|
||||||
|
|
||||||
Improvements
|
Improvements
|
||||||
- Allow scrolling panels to contain other scrolling panels
|
- Allow scrolling panels to contain other scrolling panels
|
||||||
|
|
|
@ -12,12 +12,16 @@ Strikethrough with ~~two tildes~~.
|
||||||
[I'm an inline-style link](https://www.google.com)
|
[I'm an inline-style link](https://www.google.com)
|
||||||
<http://www.example.com>
|
<http://www.example.com>
|
||||||
|
|
||||||
|
Logo:
|
||||||
![](https://raw.githubusercontent.com/Ellpeck/MLEM/main/Media/Logo.png)
|
![](https://raw.githubusercontent.com/Ellpeck/MLEM/main/Media/Logo.png)
|
||||||
|
|
||||||
|
Wide logo:
|
||||||
|
![](https://raw.githubusercontent.com/Ellpeck/MLEM/main/Media/Banner.png)
|
||||||
|
|
||||||
Some `inline code` right here
|
Some `inline code` right here
|
||||||
|
|
||||||
```js
|
```js
|
||||||
function codeBlock() {
|
function codeBlock() {
|
||||||
|
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
|
@ -69,11 +69,40 @@ namespace MLEM.Ui.Elements {
|
||||||
/// Note that increased rotation does not increase this component's size, even if the rotated texture would go out of bounds of this component.
|
/// Note that increased rotation does not increase this component's size, even if the rotated texture would go out of bounds of this component.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public float ImageRotation;
|
public float ImageRotation;
|
||||||
|
/// <summary>
|
||||||
|
/// Whether this image's width should automatically be calculated based on this image's calculated height in relation to its <see cref="Texture"/>'s aspect ratio.
|
||||||
|
/// Note that, if this is <see langword="true"/>, the <see cref="Element.AutoSizeAddedAbsolute"/> value will still be applied to this image's width.
|
||||||
|
/// </summary>
|
||||||
|
public bool SetWidthBasedOnAspect {
|
||||||
|
get => this.setWidthBasedOnAspect;
|
||||||
|
set {
|
||||||
|
if (this.setWidthBasedOnAspect != value) {
|
||||||
|
this.setWidthBasedOnAspect = value;
|
||||||
|
this.SetAreaDirty();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// Whether this image's height should automatically be calculated based on this image's calculated width in relation to its <see cref="Texture"/>'s aspect ratio.
|
||||||
|
/// This behavior is useful if an image should take up a certain width, but the aspect ratio of its texture can vary and the image should not take up more height than is necessary.
|
||||||
|
/// Note that, if this is <see langword="true"/>, the <see cref="Element.AutoSizeAddedAbsolute"/> value will still be applied to this image's height.
|
||||||
|
/// </summary>
|
||||||
|
public bool SetHeightBasedOnAspect {
|
||||||
|
get => this.setHeightBasedOnAspect;
|
||||||
|
set {
|
||||||
|
if (this.setHeightBasedOnAspect != value) {
|
||||||
|
this.setHeightBasedOnAspect = value;
|
||||||
|
this.SetAreaDirty();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public override bool IsHidden => base.IsHidden || this.Texture == null;
|
public override bool IsHidden => base.IsHidden || this.Texture == null;
|
||||||
|
|
||||||
private bool scaleToImage;
|
private bool scaleToImage;
|
||||||
|
private bool setWidthBasedOnAspect;
|
||||||
|
private bool setHeightBasedOnAspect;
|
||||||
private TextureRegion explicitlySetTexture;
|
private TextureRegion explicitlySetTexture;
|
||||||
private TextureRegion displayedTexture;
|
private TextureRegion displayedTexture;
|
||||||
|
|
||||||
|
@ -86,7 +115,7 @@ namespace MLEM.Ui.Elements {
|
||||||
/// <param name="scaleToImage">Whether this image's size should be based on the texture's size</param>
|
/// <param name="scaleToImage">Whether this image's size should be based on the texture's size</param>
|
||||||
public Image(Anchor anchor, Vector2 size, TextureRegion texture, bool scaleToImage = false) : base(anchor, size) {
|
public Image(Anchor anchor, Vector2 size, TextureRegion texture, bool scaleToImage = false) : base(anchor, size) {
|
||||||
this.Texture = texture;
|
this.Texture = texture;
|
||||||
this.scaleToImage = scaleToImage;
|
this.ScaleToImage = scaleToImage;
|
||||||
this.CanBeSelected = false;
|
this.CanBeSelected = false;
|
||||||
this.CanBeMoused = false;
|
this.CanBeMoused = false;
|
||||||
}
|
}
|
||||||
|
@ -95,14 +124,23 @@ namespace MLEM.Ui.Elements {
|
||||||
public Image(Anchor anchor, Vector2 size, TextureCallback getTextureCallback, bool scaleToImage = false) : base(anchor, size) {
|
public Image(Anchor anchor, Vector2 size, TextureCallback getTextureCallback, bool scaleToImage = false) : base(anchor, size) {
|
||||||
this.GetTextureCallback = getTextureCallback;
|
this.GetTextureCallback = getTextureCallback;
|
||||||
this.Texture = getTextureCallback(this);
|
this.Texture = getTextureCallback(this);
|
||||||
this.scaleToImage = scaleToImage;
|
this.ScaleToImage = scaleToImage;
|
||||||
this.CanBeSelected = false;
|
this.CanBeSelected = false;
|
||||||
this.CanBeMoused = false;
|
this.CanBeMoused = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
protected override Vector2 CalcActualSize(RectangleF parentArea) {
|
protected override Vector2 CalcActualSize(RectangleF parentArea) {
|
||||||
return this.Texture != null && this.scaleToImage ? this.Texture.Size.ToVector2() * this.Scale : base.CalcActualSize(parentArea);
|
var ret = base.CalcActualSize(parentArea);
|
||||||
|
if (this.Texture != null) {
|
||||||
|
if (this.ScaleToImage)
|
||||||
|
ret = this.Texture.Size.ToVector2() * this.Scale;
|
||||||
|
if (this.SetWidthBasedOnAspect)
|
||||||
|
ret.X = ret.Y * this.Texture.Width / this.Texture.Height + this.ScaledAutoSizeAddedAbsolute.X;
|
||||||
|
if (this.SetHeightBasedOnAspect)
|
||||||
|
ret.Y = ret.X * this.Texture.Height / this.Texture.Width + this.ScaledAutoSizeAddedAbsolute.Y;
|
||||||
|
}
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
|
@ -134,7 +172,7 @@ namespace MLEM.Ui.Elements {
|
||||||
return;
|
return;
|
||||||
var nullChanged = this.displayedTexture == null != (newTexture == null);
|
var nullChanged = this.displayedTexture == null != (newTexture == null);
|
||||||
this.displayedTexture = newTexture;
|
this.displayedTexture = newTexture;
|
||||||
if (nullChanged || this.scaleToImage)
|
if (nullChanged || this.ScaleToImage || this.SetWidthBasedOnAspect || this.SetHeightBasedOnAspect)
|
||||||
this.SetAreaDirty();
|
this.SetAreaDirty();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,6 @@ using MLEM.Ui.Style;
|
||||||
|
|
||||||
#if NETSTANDARD2_0_OR_GREATER || NET6_0_OR_GREATER
|
#if NETSTANDARD2_0_OR_GREATER || NET6_0_OR_GREATER
|
||||||
using System.Net.Http;
|
using System.Net.Http;
|
||||||
|
|
||||||
#else
|
#else
|
||||||
using System.Net;
|
using System.Net;
|
||||||
#endif
|
#endif
|
||||||
|
@ -146,7 +145,8 @@ namespace MLEM.Ui.Parsers {
|
||||||
throw new NullReferenceException("A UI parser requires a GraphicsDevice for parsing images");
|
throw new NullReferenceException("A UI parser requires a GraphicsDevice for parsing images");
|
||||||
|
|
||||||
TextureRegion image = null;
|
TextureRegion image = null;
|
||||||
return new Image(Anchor.AutoLeft, new Vector2(1, -1), _ => image) {
|
return new Image(Anchor.AutoLeft, Vector2.One, _ => image) {
|
||||||
|
SetHeightBasedOnAspect = true,
|
||||||
OnAddedToUi = e => {
|
OnAddedToUi = e => {
|
||||||
if (image == null)
|
if (image == null)
|
||||||
LoadImageAsync();
|
LoadImageAsync();
|
||||||
|
|
Loading…
Reference in a new issue