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

Fix badge label padding.

Browse Source
This commit is contained in:
Paul Chote
2018-08-11 17:17:42 +00:00
committed by reaperrr
parent 94c47fdac0
commit 3711a695c5
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenRA.Mods.Common/Widgets/Logic/PlayerProfileLogic.cs
View File

@@ -153,6 +153,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
messageHeader.IsVisible = () => !profileLoaded; messageHeader.IsVisible = () => !profileLoaded;
var profileWidth = 0; var profileWidth = 0;
var maxProfileWidth = widget.Bounds.Width;
var messageText = "Loading player profile..."; var messageText = "Loading player profile...";
var messageWidth = messageFont.Measure(messageText).X + 2 * message.Bounds.Left; var messageWidth = messageFont.Measure(messageText).X + 2 * message.Bounds.Left;
@@ -199,7 +200,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
Func<int, int> negotiateWidth = badgeWidth => Func<int, int> negotiateWidth = badgeWidth =>
{ {
profileWidth = Math.Min(Math.Max(badgeWidth, profileWidth), widget.Bounds.Width); profileWidth = Math.Min(Math.Max(badgeWidth, profileWidth), maxProfileWidth);
return profileWidth; return profileWidth;
}; };
@@ -219,7 +220,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
} }
} }
profileWidth = Math.Min(profileWidth, widget.Bounds.Width); profileWidth = Math.Min(profileWidth, maxProfileWidth);
header.Bounds.Width = widget.Bounds.Width = badgeContainer.Bounds.Width = profileWidth; header.Bounds.Width = widget.Bounds.Width = badgeContainer.Bounds.Width = profileWidth;
widget.Bounds.Height = header.Bounds.Height + badgeContainer.Bounds.Height; widget.Bounds.Height = header.Bounds.Height + badgeContainer.Bounds.Height;
@@ -267,8 +268,20 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var badgeTemplate = widget.Get("BADGE_TEMPLATE"); var badgeTemplate = widget.Get("BADGE_TEMPLATE");
widget.RemoveChild(badgeTemplate); widget.RemoveChild(badgeTemplate);
var width = 0; // Negotiate the label length that the tooltip will allow
var maxLabelWidth = 0;
var templateIcon = badgeTemplate.Get<SpriteWidget>("ICON");
var templateLabel = badgeTemplate.Get<LabelWidget>("LABEL");
var templateLabelFont = Game.Renderer.Fonts[templateLabel.Font];
foreach (var badge in profile.Badges)
maxLabelWidth = Math.Max(maxLabelWidth, templateLabelFont.Measure(badge.Label).X);
widget.Bounds.Width = negotiateWidth(2 * templateLabel.Bounds.Left - templateIcon.Bounds.Right + maxLabelWidth);
var badgeOffset = badgeTemplate.Bounds.Y; var badgeOffset = badgeTemplate.Bounds.Y;
if (profile.Badges.Any())
badgeOffset += 3;
foreach (var badge in profile.Badges) foreach (var badge in profile.Badges)
{ {
var b = badgeTemplate.Clone(); var b = badgeTemplate.Clone();
@@ -278,11 +291,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var label = b.Get<LabelWidget>("LABEL"); var label = b.Get<LabelWidget>("LABEL");
var labelFont = Game.Renderer.Fonts[label.Font]; var labelFont = Game.Renderer.Fonts[label.Font];
var labelText = WidgetUtils.TruncateText(badge.Label, label.Bounds.Width, labelFont); var labelText = WidgetUtils.TruncateText(badge.Label, widget.Bounds.Width - label.Bounds.X - icon.Bounds.X, labelFont);
label.GetText = () => labelText; label.GetText = () => labelText;
width = Math.Max(width, label.Bounds.Left + labelFont.Measure(labelText).X + icon.Bounds.X);
b.Bounds.Y = badgeOffset; b.Bounds.Y = badgeOffset;
widget.AddChild(b); widget.AddChild(b);
@@ -292,7 +303,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (badgeOffset > badgeTemplate.Bounds.Y) if (badgeOffset > badgeTemplate.Bounds.Y)
badgeOffset += 5; badgeOffset += 5;
widget.Bounds.Width = negotiateWidth(width);
widget.Bounds.Height = badgeOffset; widget.Bounds.Height = badgeOffset;
} }
} }