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

Merge pull request #9715 from teees/mouseovereditor

Browse Source 
Show owner and faction of units in map editor tooltips
This commit is contained in:
atlimit8
2015-10-22 20:10:33 -05:00
parent 7de98ad6d8 f9c3446849
commit 173f85319a
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Traits/World/EditorActorPreview.cs
View File

@@ -70,7 +70,7 @@ namespace OpenRA.Mods.Common.Traits
} }
var tooltip = Info.TraitInfoOrDefault<TooltipInfo>(); var tooltip = Info.TraitInfoOrDefault<TooltipInfo>();
Tooltip = tooltip == null ? ID + ": " + Info.Name : ID + ": " + tooltip.Name + " (" + Info.Name + ")"; Tooltip = tooltip == null ? ID + ": " + Info.Name : ID + ": " + tooltip.Name + " (" + Info.Name + ")" + "\n" + owner.Name + " (" + owner.Faction + ")";
GeneratePreviews(); GeneratePreviews();

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

@@ -26,11 +26,13 @@ namespace OpenRA.Mods.Common.Widgets.Logic
tooltipContainer.BeforeRender = () => tooltipContainer.BeforeRender = () =>
{ {
labelText = getText(); labelText = getText();
var textWidth = font.Measure(labelText).X; var textDim = font.Measure(labelText);
if (textWidth != cachedWidth) if (textDim.X != cachedWidth)
{ {
label.Bounds.Width = textWidth; label.Bounds.Width = textDim.X;
widget.Bounds.Width = 2 * label.Bounds.X + textWidth; widget.Bounds.Width = 2 * label.Bounds.X + textDim.X;
label.Bounds.Height = textDim.Y;
widget.Bounds.Height = 4 * label.Bounds.Y + textDim.Y;
} }
}; };