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

Merge branch 'master' into new-netcode

Browse Source 
Conflicts:
	Subsurface/Source/Characters/AI/EnemyAIController.cs
	Subsurface/Source/DebugConsole.cs
	Subsurface/Source/Items/Components/Machines/Radar.cs
	Subsurface/Source/Items/Item.cs
This commit is contained in:
Regalis
2017-04-27 21:33:44 +03:00
parent 90f354f6d7 6397bc432e
commit 64c109f13b
10 changed files with 366 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/GUI/GUIComponent.cs
+7 -3
View File
@@ -310,15 +310,19 @@ namespace Barotrauma
int centerWidth = Math.Max(rect.Width - uiSprite.Slices[0].Width - uiSprite.Slices[2].Width, 0);
int centerHeight = Math.Max(rect.Height - uiSprite.Slices[0].Height - uiSprite.Slices[8].Height, 0);
Vector2 scale = new Vector2(
MathHelper.Clamp((float)rect.Width / (uiSprite.Slices[0].Width + uiSprite.Slices[2].Width),0, 1),
MathHelper.Clamp((float)rect.Height / (uiSprite.Slices[0].Height + uiSprite.Slices[6].Height), 0, 1));
for (int x = 0; x < 3; x++)
{
int width = x == 1 ? centerWidth : uiSprite.Slices[x].Width;
float width = (x == 1 ? centerWidth : uiSprite.Slices[x].Width) * scale.X;
for (int y = 0; y < 3; y++)
{
int height = y == 1 ? centerHeight : uiSprite.Slices[x + y * 3].Height;
float height = (y == 1 ? centerHeight : uiSprite.Slices[x + y * 3].Height) * scale.Y;
spriteBatch.Draw(uiSprite.Sprite.Texture,
new Rectangle((int)pos.X, (int)pos.Y, width, height),
new Rectangle((int)pos.X, (int)pos.Y, (int)width, (int)height),
uiSprite.Slices[x + y * 3],
currColor * (currColor.A / 255.0f));
Subsurface/Source/GUI/GUITickBox.cs
+14
View File
@@ -59,6 +59,20 @@ namespace Barotrauma
get { return box.Rect; }
}
public override ScalableFont Font
{
get
{
return base.Font;
}
set
{
base.Font = value;
if (text != null) text.Font = value;
}
}
public GUITickBox(Rectangle rect, string label, Alignment alignment, GUIComponent parent)
: this(rect, label, alignment, GUI.Font, parent)
{