vlad.os/LuaCsForBarotraumaEP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

New artifact sprites, ping sound for handheld sonar, fixed newlines multiplying in GUITextBlocks every time the block is resized

Browse Source
This commit is contained in:
Regalis
2016-04-16 21:42:40 +03:00
parent 5bacb66543
commit a45f58cd08
5 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Subsurface/Source/GUI/GUITextBlock.cs
View File

@@ -17,6 +17,8 @@ namespace Barotrauma
protected Color textColor;
private string wrappedText;
public delegate string TextGetterHandler();
public TextGetterHandler TextGetter;
@@ -40,6 +42,7 @@ namespace Barotrauma
set
{
text = value;
wrappedText = value;
SetTextPos();
}
}
@@ -159,21 +162,16 @@ namespace Barotrauma
{
if (text==null) return;
wrappedText = text;
Vector2 size = MeasureText(text);
if (Wrap && rect.Width>0)
{
//text = text.Replace("\n"," ");
text = ToolBox.WrapText(text, rect.Width - padding.X - padding.Z, Font);
wrappedText = ToolBox.WrapText(text, rect.Width - padding.X - padding.Z, Font);
Vector2 newSize = MeasureText(text);
Vector2 newSize = MeasureText(wrappedText);
//Rectangle newRect = rect;
//newRect.Width += (int)(newSize.X-size.X);
//newRect.Height += (int)(newSize.Y - size.Y);
//Rect = newRect;
size = newSize;
}
@@ -204,9 +202,9 @@ namespace Barotrauma
textPos.X = (int)textPos.X;
textPos.Y = (int)textPos.Y;
if (text.Contains("\n"))
if (wrappedText.Contains("\n"))
{
string[] lines = text.Split('\n');
string[] lines = wrappedText.Split('\n');
Vector2 lastLineSize = MeasureText(lines[lines.Length-1]);
caretPos = new Vector2(rect.X + lastLineSize.X, rect.Y + size.Y - lastLineSize.Y) + textPos - origin;
}
@@ -256,7 +254,7 @@ namespace Barotrauma
if (!string.IsNullOrEmpty(text))
{
spriteBatch.DrawString(Font,
text,
Wrap ? wrappedText : text,
new Vector2(rect.X, rect.Y) + textPos + offset,
textColor * (textColor.A / 255.0f),
0.0f, origin, 1.0f,