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

Overhaul the lobby faction dropdown for ra

Browse Source
This commit is contained in:
ScottNZ
2014-11-23 19:58:57 +13:00
parent ac090b3acd
commit 4f4c67735d
12 changed files with 185 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenRA.Game/Widgets/ButtonWidget.cs
View File

@@ -47,6 +47,7 @@ namespace OpenRA.Widgets
public readonly string TooltipContainer;
public readonly string TooltipTemplate = "BUTTON_TOOLTIP";
[Translate] public string TooltipText;
public Func<string> GetTooltipText;
// Equivalent to OnMouseUp, but without an input arg
public Action OnClick = () => {};
@@ -68,6 +69,7 @@ namespace OpenRA.Widgets
OnKeyPress = _ => OnClick();
IsDisabled = () => Disabled;
IsHighlighted = () => Highlighted;
GetTooltipText = () => TooltipText;
tooltipContainer = Exts.Lazy(() =>
Ui.Root.Get<TooltipContainerWidget>(TooltipContainer));
}
@@ -102,6 +104,7 @@ namespace OpenRA.Widgets
TooltipTemplate = other.TooltipTemplate;
TooltipText = other.TooltipText;
GetTooltipText = other.GetTooltipText;
TooltipContainer = other.TooltipContainer;
tooltipContainer = Exts.Lazy(() =>
Ui.Root.Get<TooltipContainerWidget>(TooltipContainer));
@@ -177,19 +180,23 @@ namespace OpenRA.Widgets
public override void MouseEntered()
{
if (TooltipContainer == null) return;
if (TooltipContainer == null || GetTooltipText() == null)
return;
tooltipContainer.Value.SetTooltip(TooltipTemplate,
new WidgetArgs() {{ "button", this }});
new WidgetArgs { { "button", this } });
}
public override void MouseExited()
{
if (TooltipContainer == null) return;
if (TooltipContainer == null || !tooltipContainer.IsValueCreated)
return;
tooltipContainer.Value.RemoveTooltip();
}
public override int2 ChildOrigin { get { return RenderOrigin +
((Depressed) ? new int2(VisualHeight, VisualHeight) : new int2(0, 0)); } }
(Depressed ? new int2(VisualHeight, VisualHeight) : new int2(0, 0)); } }
public override void Draw()
{
@@ -209,10 +216,10 @@ namespace OpenRA.Widgets
DrawBackground(rb, disabled, Depressed, Ui.MouseOverWidget == this, highlighted);
if (Contrast)
font.DrawTextWithContrast(text, position + stateOffset,
disabled ? colordisabled : color, contrast, 2);
disabled ? colordisabled : color, contrast, 2);
else
font.DrawText(text, position + stateOffset,
disabled ? colordisabled : color);
disabled ? colordisabled : color);
}
public override Widget Clone() { return new ButtonWidget(this); }

33
OpenRA.Game/Widgets/DropDownButtonWidget.cs
View File

@@ -19,12 +19,19 @@ namespace OpenRA.Widgets
{
Widget panel;
MaskWidget fullscreenMask;
Widget panelRoot;
public string PanelRoot;
[ObjectCreator.UseCtor]
public DropDownButtonWidget(Ruleset modRules)
: base(modRules) { }
protected DropDownButtonWidget(DropDownButtonWidget widget) : base(widget) { }
protected DropDownButtonWidget(DropDownButtonWidget widget)
: base(widget)
{
PanelRoot = widget.PanelRoot;
}
public override void Draw()
{
@@ -34,7 +41,7 @@ namespace OpenRA.Widgets
var image = ChromeProvider.GetImage("scrollbar", IsDisabled() ? "down_pressed" : "down_arrow");
var rb = RenderBounds;
var color = GetColor();
var colordisabled = GetColorDisabled();
var colorDisabled = GetColorDisabled();
WidgetUtils.DrawRGBA( image,
stateOffset + new float2( rb.Right - rb.Height + 4,
@@ -42,7 +49,7 @@ namespace OpenRA.Widgets
WidgetUtils.FillRectWithColor(new Rectangle(stateOffset.X + rb.Right - rb.Height,
stateOffset.Y + rb.Top + 3, 1, rb.Height - 6),
IsDisabled() ? colordisabled : color);
IsDisabled() ? colorDisabled : color);
}
public override Widget Clone() { return new DropDownButtonWidget(this); }
@@ -61,8 +68,8 @@ namespace OpenRA.Widgets
if (panel == null)
return;
Ui.Root.RemoveChild(fullscreenMask);
Ui.Root.RemoveChild(panel);
panelRoot.RemoveChild(fullscreenMask);
panelRoot.RemoveChild(panel);
panel = fullscreenMask = null;
}
@@ -80,11 +87,17 @@ namespace OpenRA.Widgets
if (onCancel != null)
fullscreenMask.OnMouseDown += _ => onCancel();
Ui.Root.AddChild(fullscreenMask);
panelRoot = PanelRoot == null ? Ui.Root : Ui.Root.Get(PanelRoot);
panelRoot.AddChild(fullscreenMask);
var oldBounds = panel.Bounds;
panel.Bounds = new Rectangle(RenderOrigin.X, RenderOrigin.Y + Bounds.Height, oldBounds.Width, oldBounds.Height);
Ui.Root.AddChild(panel);
panel.Bounds = new Rectangle(
RenderOrigin.X - panelRoot.RenderOrigin.X,
RenderOrigin.Y + Bounds.Height - panelRoot.RenderOrigin.Y,
oldBounds.Width,
oldBounds.Height);
panelRoot.AddChild(panel);
}
public void ShowDropDown<T>(string panelTemplate, int maxHeight, IEnumerable<T> options, Func<T, ScrollItemWidget, ScrollItemWidget> setupItem)
@@ -116,14 +129,14 @@ namespace OpenRA.Widgets
var panel = (ScrollPanelWidget)Ui.LoadWidget(panelTemplate, null, new WidgetArgs()
{{ "substitutions", substitutions }});
var headerTemplate = panel.Get<ScrollItemWidget>("HEADER");
var headerTemplate = panel.GetOrNull<ScrollItemWidget>("HEADER");
var itemTemplate = panel.Get<ScrollItemWidget>("TEMPLATE");
panel.RemoveChildren();
foreach (var kv in groups)
{
var group = kv.Key;
if (group.Length > 0)
if (group.Length > 0 && headerTemplate != null)
{
var header = ScrollItemWidget.Setup(headerTemplate, () => true, () => {});
header.Get<LabelWidget>("LABEL").GetText = () => group;