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

Merge branch 'NewCoordinateSystem'

Browse Source 
Conflicts:
	Subsurface/Barotrauma.csproj
	Subsurface_Solution.v12.suo
This commit is contained in:
Regalis
2015-12-17 18:29:26 +02:00
parent ca7eae5322 af470eab2e
commit fa5cceb903
105 changed files with 2401 additions and 1288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Subsurface/Source/GUI/GUIProgressBar.cs
View File

@@ -37,12 +37,18 @@ namespace Barotrauma
}
public GUIProgressBar(Rectangle rect, Color color, float barSize, Alignment alignment, GUIComponent parent = null)
: base(null)
: this(rect,color,null, barSize,alignment, parent)
{
}
public GUIProgressBar(Rectangle rect, Color color, GUIStyle style, float barSize, Alignment alignment, GUIComponent parent = null)
: base(style)
{
this.rect = rect;
this.color = color;
isHorizontal = (rect.Width > rect.Height);
this.alignment = alignment;
margin = 5;
@@ -50,19 +56,36 @@ namespace Barotrauma
if (parent != null)
parent.AddChild(this);
frame = new GUIFrame(new Rectangle(0,0,0,0), Color.White, null, this);
frame = new GUIFrame(new Rectangle(0, 0, 0, 0), Color.Black, null, this);
this.barSize = barSize;
UpdateRect();
if (style != null) style.Apply(this);
}
public override void ApplyStyle(GUIComponentStyle style)
{
if (frame == null) return;
frame.Color = style.Color;
frame.HoverColor = style.HoverColor;
frame.SelectedColor = style.SelectedColor;
Padding = style.Padding;
frame.OutlineColor = style.OutlineColor;
this.style = style;
}
private void UpdateRect()
{
rect = new Rectangle(
frame.Rect.X + margin,
frame.Rect.Y + margin,
isHorizontal ? (int)((frame.Rect.Width - margin * 2) * barSize) : (frame.Rect.Width - margin * 2),
isHorizontal ? (frame.Rect.Height - margin * 2) : (int)((frame.Rect.Height - margin * 2) * barSize));
(int)(frame.Rect.X + padding.X),
(int)(frame.Rect.Y + padding.Y),
isHorizontal ? (int)((frame.Rect.Width - padding.X - padding.Z) * barSize) : (frame.Rect.Width - margin * 2),
isHorizontal ? (int)(frame.Rect.Height - padding.Y - padding.W) : (int)((frame.Rect.Height - margin * 2) * barSize));
}
public override void Draw(SpriteBatch spriteBatch)