epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor ScrollItemWidget to use stateful image names

Browse Source
This commit is contained in:
Gustas
2022-08-23 16:40:47 +03:00
committed by Pavel Penev
parent 11a2e6e19b
commit 08dbfe0cbd
7 changed files with 65 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenRA.Mods.Common/Widgets/ScrollItemWidget.cs
View File

@@ -10,6 +10,7 @@
#endregion
using System;
using OpenRA.Graphics;
using OpenRA.Widgets;
namespace OpenRA.Mods.Common.Widgets
@@ -20,12 +21,15 @@ namespace OpenRA.Mods.Common.Widgets
public readonly bool EnableChildMouseOver = false;
public string ItemKey;
readonly CachedTransform<(bool, bool, bool, bool, bool), Sprite[]> getPanelCache;
[ObjectCreator.UseCtor]
public ScrollItemWidget(ModData modData)
: base(modData)
{
IsVisible = () => false;
VisualHeight = 0;
getPanelCache = WidgetUtils.GetCachedStatefulPanelImages(BaseName);
}
protected ScrollItemWidget(ScrollItemWidget other)
@@ -36,6 +40,7 @@ namespace OpenRA.Mods.Common.Widgets
Key = other.Key;
BaseName = other.BaseName;
EnableChildMouseOver = other.EnableChildMouseOver;
getPanelCache = WidgetUtils.GetCachedStatefulPanelImages(BaseName);
}
public override void Initialize(WidgetArgs args)
@@ -51,17 +56,18 @@ namespace OpenRA.Mods.Common.Widgets
public override void Draw()
{
if (string.IsNullOrEmpty(BaseName))
return;
// PERF: Only check for ourself or our direct children
var isHover = Ui.MouseOverWidget == this;
if (!IgnoreChildMouseOver && !isHover)
isHover = Children.Contains(Ui.MouseOverWidget);
var hover = Ui.MouseOverWidget == this;
if (!IgnoreChildMouseOver && !hover)
hover = Children.Contains(Ui.MouseOverWidget);
var state = IsSelected() ? BaseName + "-selected" :
isHover ? BaseName + "-hover" :
null;
var panel = getPanelCache.Update((IsDisabled(), Depressed, hover, false, IsSelected() || IsHighlighted()));
if (state != null)
WidgetUtils.DrawPanel(state, RenderBounds);
if (panel != null)
WidgetUtils.DrawPanel(RenderBounds, panel);
}
public override Widget Clone() { return new ScrollItemWidget(this); }

12
OpenRA.Mods.Common/Widgets/WidgetUtils.cs
View File

@@ -41,6 +41,18 @@ namespace OpenRA.Mods.Common.Widgets
});
}
// TODO: refactor buttons and related UI to use this function
public static CachedTransform<(bool Disabled, bool Pressed, bool Hover, bool Focused, bool Highlighted), Sprite[]> GetCachedStatefulPanelImages(string collection)
{
return new CachedTransform<(bool, bool, bool, bool, bool), Sprite[]>(
((bool Disabled, bool Pressed, bool Hover, bool Focused, bool Highlighted) args) =>
{
var collectionName = collection + (args.Highlighted ? "-highlighted" : "");
var variantCollectionName = GetStatefulImageName(collectionName, args.Disabled, args.Pressed, args.Hover, args.Focused);
return ChromeProvider.GetPanelImages(variantCollectionName) ?? ChromeProvider.GetPanelImages(collectionName);
});
}
public static void DrawSprite(Sprite s, float2 pos)
{
Game.Renderer.RgbaSpriteRenderer.DrawSprite(s, pos);

11
mods/cnc/chrome.yaml
View File

@@ -205,16 +205,23 @@ scrollpanel-button-gdi-disabled:
scrollpanel-button-gdi-pressed:
Inherits: button-gdi-pressed
scrollitem:
scrollitem-hover:
Inherits: button
scrollitem-selected:
scrollitem-highlighted:
Inherits: button-pressed
scrollitem-nohover:
scrollitem-nohover-hover:
scrollitem-nohover-highlighted:
scrollheader:
Inherits: button
scrollheader-highlighted:
Inherits: button
#
# Slider

1
mods/cnc/chrome/missionbrowser.yaml
View File

@@ -24,6 +24,7 @@ Container@MISSIONBROWSER_PANEL:
Height: PARENT_BOTTOM - 30
Children:
ScrollItem@HEADER:
BaseName: scrollheader
Width: PARENT_RIGHT - 27
Height: 13
X: 2

15
mods/d2k/chrome.yaml
View File

@@ -446,18 +446,23 @@ checkbox-toggle-highlighted-hover:
checkbox-toggle-highlighted-pressed:
Inherits: checkbox-highlighted-pressed
scrollitem-selected:
Inherits: button-pressed
scrollitem:
scrollitem-hover:
Inherits: button
scrollheader-selected:
Inherits: button
scrollitem-highlighted:
Inherits: button-pressed
scrollitem-nohover:
scrollitem-nohover-hover:
scrollitem-nohover-highlighted:
scrollheader:
Inherits: button
scrollheader-highlighted:
Inherits: button
scrollpanel-decorations:
Inherits: ^Glyphs

15
mods/ra/chrome.yaml
View File

@@ -575,18 +575,23 @@ checkbox-toggle-highlighted-hover:
checkbox-toggle-highlighted-pressed:
Inherits: checkbox-highlighted-pressed
scrollitem-selected:
Inherits: button-pressed
scrollitem:
scrollitem-hover:
Inherits: button
scrollheader-selected:
Inherits: button
scrollitem-highlighted:
Inherits: button-pressed
scrollitem-nohover:
scrollitem-nohover-hover:
scrollitem-nohover-highlighted:
scrollheader:
Inherits: button
scrollheader-highlighted:
Inherits: button
logos:
Inherits: ^LoadScreen

13
mods/ts/chrome.yaml
View File

@@ -708,17 +708,22 @@ checkbox-toggle-highlighted-hover:
checkbox-toggle-highlighted-pressed:
Inherits: checkbox-highlighted-pressed
scrollitem-selected:
Inherits: button-pressed
scrollitem:
scrollitem-hover:
Inherits: button
scrollitem-highlighted:
Inherits: button-pressed
scrollitem-nohover:
scrollitem-nohover-hover:
scrollitem-nohover-highlighted:
scrollheader-selected:
scrollheader:
Inherits: button
scrollheader-highlighted:
Inherits: button
mainmenu-border: