mirror of
https://github.com/Ellpeck/MLEM.git
synced 2024-12-26 02:09:24 +01:00
Added the ability to specify Dropdown paragraph colors through style properties
This commit is contained in:
parent
e68daeb479
commit
866aec871d
3 changed files with 28 additions and 3 deletions
|
@ -36,6 +36,7 @@ Additions
|
||||||
- Added TextField.OnEnterPressed event
|
- Added TextField.OnEnterPressed event
|
||||||
- Added Tooltip.IgnoreViewport and allow overriding the default viewport using Tooltip.Viewport
|
- Added Tooltip.IgnoreViewport and allow overriding the default viewport using Tooltip.Viewport
|
||||||
- Added the ability for Dropdown to display an arrow texture based on its open state
|
- Added the ability for Dropdown to display an arrow texture based on its open state
|
||||||
|
- Added the ability to specify Dropdown paragraph colors through style properties
|
||||||
|
|
||||||
Fixes
|
Fixes
|
||||||
- Fixed tooltips not being bounded correctly for viewports that don't start at the origin
|
- Fixed tooltips not being bounded correctly for viewports that don't start at the origin
|
||||||
|
|
|
@ -8,11 +8,13 @@ namespace MLEM.Ui.Elements {
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// A dropdown component to use inside of a <see cref="UiSystem"/>.
|
/// A dropdown component to use inside of a <see cref="UiSystem"/>.
|
||||||
/// A dropdown is a component that contains a hidden panel which is displayed upon pressing the dropdown button.
|
/// A dropdown is a component that contains a hidden panel which is displayed upon pressing the dropdown button.
|
||||||
|
/// Elements can be added to the dropdown's <see cref="Dropdown.Panel"/> through <see cref="AddElement(MLEM.Ui.Elements.Element,int)"/> or one of its overloads, which additionally causes them to have correct gamepad navigation behavior.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class Dropdown : Button {
|
public class Dropdown : Button {
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The panel that this dropdown contains. It will be displayed upon pressing the dropdown button.
|
/// The panel that this dropdown contains. It will be displayed upon pressing the dropdown button.
|
||||||
|
/// To add elements to this panel, you can use <see cref="AddElement(MLEM.Ui.Elements.Element,int)"/> or one of its overloads, which additionally causes them to have correct gamepad navigation behavior.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public Panel Panel { get; private set; }
|
public Panel Panel { get; private set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -65,6 +67,16 @@ namespace MLEM.Ui.Elements {
|
||||||
this.UpdateArrowStyle();
|
this.UpdateArrowStyle();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// A style property containing the <see cref="Color"/> that a paragraph added to this dropdown through <see cref="M:MLEM.Ui.Elements.Dropdown.AddElement(MLEM.Ui.Elements.Paragraph.TextCallback,MLEM.Ui.Elements.Element.GenericCallback,System.Int32)"/> should have by default.
|
||||||
|
/// For elements added through other overloads of <see cref="AddElement(MLEM.Ui.Elements.Element,int)"/>, this property has no effect.
|
||||||
|
/// </summary>
|
||||||
|
public StyleProp<Color> TextColor;
|
||||||
|
/// <summary>
|
||||||
|
/// A style property containing the <see cref="Color"/> that a paragraph added to this dropdown through <see cref="M:MLEM.Ui.Elements.Dropdown.AddElement(MLEM.Ui.Elements.Paragraph.TextCallback,MLEM.Ui.Elements.Element.GenericCallback,System.Int32)"/> should have when hovered.
|
||||||
|
/// For elements added through other overloads of <see cref="AddElement(MLEM.Ui.Elements.Element,int)"/>, this property has no effect.
|
||||||
|
/// </summary>
|
||||||
|
public StyleProp<Color> HoveredTextColor;
|
||||||
|
|
||||||
private StyleProp<TextureRegion> openedArrowTexture;
|
private StyleProp<TextureRegion> openedArrowTexture;
|
||||||
private StyleProp<TextureRegion> closedArrowTexture;
|
private StyleProp<TextureRegion> closedArrowTexture;
|
||||||
|
@ -144,7 +156,7 @@ namespace MLEM.Ui.Elements {
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Adds a pressable <see cref="Paragraph"/> element to this dropdown's <see cref="Panel"/>.
|
/// Adds a pressable <see cref="Paragraph"/> element to this dropdown's <see cref="Panel"/>.
|
||||||
/// By default, the paragraph's text color will change from <see cref="Color.White"/> to <see cref="Color.LightGray"/> when hovering over it.
|
/// By default, the paragraph's text color will change from <see cref="TextColor"/> to <see cref="HoveredTextColor"/> when hovering over it.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="text">The text to display</param>
|
/// <param name="text">The text to display</param>
|
||||||
/// <param name="pressed">The resulting paragraph's <see cref="Element.OnPressed"/> event</param>
|
/// <param name="pressed">The resulting paragraph's <see cref="Element.OnPressed"/> event</param>
|
||||||
|
@ -157,8 +169,8 @@ namespace MLEM.Ui.Elements {
|
||||||
};
|
};
|
||||||
if (pressed != null)
|
if (pressed != null)
|
||||||
paragraph.OnPressed += pressed;
|
paragraph.OnPressed += pressed;
|
||||||
paragraph.OnMouseEnter += e => paragraph.TextColor = Color.LightGray;
|
paragraph.OnMouseEnter += e => paragraph.TextColor = this.HoveredTextColor;
|
||||||
paragraph.OnMouseExit += e => paragraph.TextColor = Color.White;
|
paragraph.OnMouseExit += e => paragraph.TextColor = this.TextColor;
|
||||||
this.AddElement(paragraph, index);
|
this.AddElement(paragraph, index);
|
||||||
return paragraph;
|
return paragraph;
|
||||||
}
|
}
|
||||||
|
@ -198,6 +210,8 @@ namespace MLEM.Ui.Elements {
|
||||||
this.ArrowPadding = this.ArrowPadding.OrStyle(style.DropdownArrowPadding);
|
this.ArrowPadding = this.ArrowPadding.OrStyle(style.DropdownArrowPadding);
|
||||||
this.ClosedArrowTexture = this.ClosedArrowTexture.OrStyle(style.DropdownClosedArrowTexture);
|
this.ClosedArrowTexture = this.ClosedArrowTexture.OrStyle(style.DropdownClosedArrowTexture);
|
||||||
this.OpenedArrowTexture = this.OpenedArrowTexture.OrStyle(style.DropdownOpenedArrowTexture);
|
this.OpenedArrowTexture = this.OpenedArrowTexture.OrStyle(style.DropdownOpenedArrowTexture);
|
||||||
|
this.TextColor = this.TextColor.OrStyle(style.DropdownTextColor);
|
||||||
|
this.HoveredTextColor = this.HoveredTextColor.OrStyle(style.DropdownHoveredTextColor);
|
||||||
this.UpdateArrowStyle();
|
this.UpdateArrowStyle();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -257,6 +257,16 @@ namespace MLEM.Ui.Style {
|
||||||
/// This value is passed to <see cref="Dropdown.OpenedArrowTexture"/>.
|
/// This value is passed to <see cref="Dropdown.OpenedArrowTexture"/>.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public TextureRegion DropdownOpenedArrowTexture;
|
public TextureRegion DropdownOpenedArrowTexture;
|
||||||
|
/// <summary>
|
||||||
|
/// The color that a <see cref="Dropdown"/>'s paragraphs should have by default.
|
||||||
|
/// This value is passed to <see cref="Dropdown.TextColor"/>.
|
||||||
|
/// </summary>
|
||||||
|
public Color DropdownTextColor = Color.White;
|
||||||
|
/// <summary>
|
||||||
|
/// The color that a <see cref="Dropdown"/>'s paragraphs should have when hovered.
|
||||||
|
/// This value is passed to <see cref="Dropdown.HoveredTextColor"/>.
|
||||||
|
/// </summary>
|
||||||
|
public Color DropdownHoveredTextColor = Color.LightGray;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// A set of additional fonts that can be used for the <c><f FontName></c> formatting code
|
/// A set of additional fonts that can be used for the <c><f FontName></c> formatting code
|
||||||
|
|
Loading…
Reference in a new issue