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

Revert "Scissor the text of a ButtonWidget if it overflows and display a tooltip"

Browse Source 
This reverts parts of commit 76a6e7ec92.
This commit is contained in:
Ivaylo Draganov
2019-07-02 00:01:00 +03:00
committed by abcdefg30
parent 70dc053c5f
commit ef0cb7552d
1 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -243,27 +243,12 @@ namespace OpenRA.Mods.Common.Widgets
var bgDark = GetContrastColorDark(); var bgDark = GetContrastColorDark();
var bgLight = GetContrastColorLight(); var bgLight = GetContrastColorLight();
var contentWidth = Bounds.Width - LeftMargin - RightMargin;
var stateOffset = Depressed ? new int2(VisualHeight, VisualHeight) : new int2(0, 0); var stateOffset = Depressed ? new int2(VisualHeight, VisualHeight) : new int2(0, 0);
var position = GetTextPosition(text, font, rb); var position = GetTextPosition(text, font, rb);
var hover = Ui.MouseOverWidget == this || Children.Any(c => c == Ui.MouseOverWidget); var hover = Ui.MouseOverWidget == this || Children.Any(c => c == Ui.MouseOverWidget);
DrawBackground(rb, disabled, Depressed, hover, highlighted); DrawBackground(rb, disabled, Depressed, hover, highlighted);
// Scissor when the text overflows
var isTextOverflowing = font.Measure(text).X > contentWidth;
if (isTextOverflowing && TooltipContainer != null)
{
Game.Renderer.EnableScissor(new Rectangle(RenderOrigin.X + LeftMargin, RenderOrigin.Y,
contentWidth, Bounds.Bottom));
if (GetTooltipText() == null)
GetTooltipText = () => GetText();
text = WidgetUtils.TruncateText(text, contentWidth, font);
}
if (Contrast) if (Contrast)
font.DrawTextWithContrast(text, position + stateOffset, font.DrawTextWithContrast(text, position + stateOffset,
disabled ? colordisabled : color, bgDark, bgLight, 2); disabled ? colordisabled : color, bgDark, bgLight, 2);
@@ -272,9 +257,6 @@ namespace OpenRA.Mods.Common.Widgets
else else
font.DrawText(text, position + stateOffset, font.DrawText(text, position + stateOffset,
disabled ? colordisabled : color); disabled ? colordisabled : color);
if (isTextOverflowing && TooltipContainer != null)
Game.Renderer.DisableScissor();
} }
int2 GetTextPosition(string text, SpriteFont font, Rectangle rb) int2 GetTextPosition(string text, SpriteFont font, Rectangle rb)