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

(33ab1e038) Add buttons for resetting the settings to the defaults and setting the default keybindings. TODO: pressing the buttons should refresh the settings frame instead of closing it.

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-04-04 11:10:14 +03:00
parent 371bcb11c1
commit b08a31a68f
63 changed files with 1069 additions and 668 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/GUI/GUIButton.cs
+1 -3
View File
@@ -20,8 +20,6 @@ namespace Barotrauma
public OnButtonDownHandler OnButtonDown;
public bool CanBeSelected = true;
private Color? defaultTextColor;
public override bool Enabled
{
@@ -32,7 +30,7 @@ namespace Barotrauma
set
{
if (value == enabled) { return; }
if (value == enabled) return;
enabled = value;
if (color.A == 0)
{
Barotrauma/BarotraumaClient/Source/GUI/GUIImage.cs
-1
View File
@@ -70,7 +70,6 @@ namespace Barotrauma
private GUIImage(RectTransform rectT, Sprite sprite, Rectangle? sourceRect, bool scaleToFit, string style) : base(style, rectT)
{
this.scaleToFit = scaleToFit;
sprite?.EnsureLazyLoaded();
Sprite = sprite;
if (sourceRect.HasValue)
{
Barotrauma/BarotraumaClient/Source/GUI/GUIListBox.cs
+2 -11
View File
@@ -506,7 +506,7 @@ namespace Barotrauma
{
if (ScrollBar.IsHorizontal)
{
if (pos + child.Rect.Height + spacing > Content.Rect.Height)
if (pos + child.Rect.Height + spacing > Content.Rect.Height || child == children.Last())
{
pos = 0;
totalSize += child.Rect.Width + spacing;
@@ -515,14 +515,10 @@ namespace Barotrauma
{
pos += child.Rect.Height + spacing;
}
if (child == children.Last())
{
totalSize += child.Rect.Width + spacing;
}
}
else
{
if (pos + child.Rect.Width + spacing > Content.Rect.Width)
if (pos + child.Rect.Width + spacing > Content.Rect.Width || child == children.Last())
{
pos = 0;
totalSize += child.Rect.Height + spacing;
@@ -531,11 +527,6 @@ namespace Barotrauma
{
pos += child.Rect.Width + spacing;
}
if (child == children.Last())
{
totalSize += child.Rect.Height + spacing;
}
}
}
}