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

Merge pull request #10913 from pchote/fix-editor-tooltips

Browse Source 
Fix multi-line tooltip padding.
This commit is contained in:
Oliver Brakmann
2016-03-13 15:17:25 +01:00
parent b097f7df91 dbe55eedaf
commit 6b7bf86373
7 changed files with 43 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Widgets/ButtonWidget.cs
View File

@@ -188,7 +188,7 @@ namespace OpenRA.Mods.Common.Widgets
return;
tooltipContainer.Value.SetTooltip(TooltipTemplate,
new WidgetArgs { { "button", this } });
new WidgetArgs { { "button", this }, { "getText", GetTooltipText } });
}
public override void MouseExited()

47
OpenRA.Mods.Common/Widgets/Logic/SimpleTooltipLogic.cs
View File

@@ -20,33 +20,42 @@ namespace OpenRA.Mods.Common.Widgets.Logic
public SimpleTooltipLogic(Widget widget, TooltipContainerWidget tooltipContainer, Func<string> getText)
{
var label = widget.Get<LabelWidget>("LABEL");
var spacing = widget.Get("LINE_HEIGHT");
widget.RemoveChildren();
var font = Game.Renderer.Fonts[label.Font];
var cachedWidth = 0;
var cachedHeight = 0;
var horizontalPadding = label.Bounds.Width - widget.Bounds.Width;
if (horizontalPadding <= 0)
horizontalPadding = 2 * label.Bounds.X;
var vertcalPadding = widget.Bounds.Height - label.Bounds.Height;
if (vertcalPadding <= 0)
vertcalPadding = 2 * label.Bounds.Y;
var labelText = "";
var cachedText = "";
tooltipContainer.BeforeRender = () =>
{
labelText = getText();
var textDim = font.Measure(labelText);
if (textDim.X != cachedWidth || textDim.Y != cachedHeight)
{
label.Bounds.Width = textDim.X;
widget.Bounds.Width = horizontalPadding + textDim.X;
label.Bounds.Height = textDim.Y;
widget.Bounds.Height = vertcalPadding + textDim.Y;
cachedWidth = textDim.X;
cachedHeight = textDim.Y;
}
};
var text = getText();
if (text == cachedText)
return;
label.GetText = () => labelText;
var lines = text.Split('\n');
var textWidth = font.Measure(text).X;
// Set up label widgets
widget.RemoveChildren();
var bottom = 0;
for (var i = 0; i < lines.Length; i++)
{
var line = (LabelWidget)label.Clone();
var lineText = lines[i];
line.Bounds.Y += spacing.Bounds.Y + i * spacing.Bounds.Height;
line.Bounds.Width = textWidth;
line.GetText = () => lineText;
widget.AddChild(line);
bottom = line.Bounds.Y + line.Bounds.Height;
}
widget.Bounds.Width = horizontalPadding + textWidth;
widget.Bounds.Height = bottom + spacing.Bounds.Y;
cachedText = text;
};
}
}
}