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

stairs fix, wraptext fix, moved drawing sprites from GUIFrame to GUIComponent, server name and "welcome text" in netlobby

Browse Source
This commit is contained in:
Regalis
2015-07-21 18:43:57 +03:00
parent 326b46cf18
commit 9a7eae8ace
15 changed files with 158 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Subsurface/GUI/GUITextBlock.cs
View File

@@ -19,7 +19,9 @@ namespace Subsurface
public delegate string TextGetterHandler();
public TextGetterHandler TextGetter;
private bool wrap;
public bool Wrap;
public override Vector4 Padding
{
@@ -111,7 +113,7 @@ namespace Subsurface
//if (wrap)
//{
this.wrap = wrap;
this.Wrap = wrap;
// this.text = ToolBox.WrapText(this.text, rect.Width);
//}
@@ -124,19 +126,19 @@ namespace Subsurface
Vector2 size = MeasureText();
if (wrap && rect.Width>0)
if (Wrap && rect.Width>0)
{
text = text.Replace("\n"," ");
//text = text.Replace("\n"," ");
text = ToolBox.WrapText(text, rect.Width, Font);
Vector2 newSize = MeasureText();
Rectangle newRect = rect;
//Rectangle newRect = rect;
//newRect.Width += (int)(newSize.X-size.X);
newRect.Height += (int)(newSize.Y - size.Y);
//newRect.Height += (int)(newSize.Y - size.Y);
Rect = newRect;
//Rect = newRect;
size = newSize;
}
@@ -184,6 +186,8 @@ namespace Subsurface
GUI.DrawRectangle(spriteBatch, rect, currColor*(currColor.A/255.0f), true);
base.Draw(spriteBatch);
if (TextGetter != null) text = TextGetter();
if (!string.IsNullOrEmpty(text))