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

ObjectProperties support enums, added a dropdown for enum properties to item editing UI.

Browse Source
This commit is contained in:
Joonas Rikkonen
2017-10-04 20:07:57 +03:00
parent 1ff2054ca8
commit 3aaf5cbae2
2 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Items/Item.cs
+19 -1
View File
@@ -218,7 +218,7 @@ namespace Barotrauma
if (value is bool) if (value is bool)
{ {
GUITickBox propertyTickBox = new GUITickBox(new Rectangle(10, y, 18, 18), objectProperty.Name, GUITickBox propertyTickBox = new GUITickBox(new Rectangle(10, y, 18, boxHeight), objectProperty.Name,
Alignment.Left, editingHUD); Alignment.Left, editingHUD);
propertyTickBox.Font = GUI.SmallFont; propertyTickBox.Font = GUI.SmallFont;
@@ -227,6 +227,24 @@ namespace Barotrauma
propertyTickBox.UserData = objectProperty; propertyTickBox.UserData = objectProperty;
propertyTickBox.OnSelected = EnterProperty; propertyTickBox.OnSelected = EnterProperty;
} }
else if (value.GetType().IsEnum)
{
new GUITextBlock(new Rectangle(0, y, 100, 18), objectProperty.Name, "", Alignment.TopLeft, Alignment.Left, editingHUD, false, GUI.SmallFont);
GUIDropDown enumDropDown = new GUIDropDown(new Rectangle(180, y, 250, boxHeight), "", "", editingHUD);
foreach (object enumValue in Enum.GetValues(value.GetType()))
{
var enumTextBlock = new GUITextBlock(new Rectangle(0, 0, 200, 25), enumValue.ToString(), "", enumDropDown);
enumTextBlock.UserData = enumValue;
}
enumDropDown.OnSelected += (selected, val) =>
{
objectProperty.TrySetValue(val);
return true;
};
enumDropDown.SelectItem(value);
}
else else
{ {
new GUITextBlock(new Rectangle(0, y, 100, 18), objectProperty.Name, "", Alignment.TopLeft, Alignment.Left, editingHUD, false, GUI.SmallFont); new GUITextBlock(new Rectangle(0, y, 100, 18), objectProperty.Name, "", Alignment.TopLeft, Alignment.Left, editingHUD, false, GUI.SmallFont);
Barotrauma/BarotraumaShared/Source/Properties.cs
+20 -7
View File
@@ -72,8 +72,7 @@ namespace Barotrauma
} }
else if (property.PropertyType == typeof(float)) else if (property.PropertyType == typeof(float))
{ {
float floatVal = 0.0f; float floatVal;
if (float.TryParse(value, NumberStyles.Float, CultureInfo.InvariantCulture, out floatVal)) if (float.TryParse(value, NumberStyles.Float, CultureInfo.InvariantCulture, out floatVal))
{ {
propertyInfo.SetValue(obj, floatVal, null); propertyInfo.SetValue(obj, floatVal, null);
@@ -81,16 +80,30 @@ namespace Barotrauma
} }
else if (property.PropertyType == typeof(bool)) else if (property.PropertyType == typeof(bool))
{ {
propertyInfo.SetValue(obj, (value.ToLowerInvariant() == "true"), null); propertyInfo.SetValue(obj, value.ToLowerInvariant() == "true", null);
} }
else if (property.PropertyType == typeof(int)) else if (property.PropertyType == typeof(int))
{ {
int intVal = 0; int intVal;
if (int.TryParse(value, out intVal)) if (int.TryParse(value, out intVal))
{ {
propertyInfo.SetValue(obj, intVal, null); propertyInfo.SetValue(obj, intVal, null);
} }
} }
else if (property.PropertyType.IsEnum)
{
object enumVal;
try
{
enumVal = Enum.Parse(propertyInfo.PropertyType, value);
}
catch (Exception e)
{
DebugConsole.ThrowError("Failed to set the value of the property \"" + Name + "\" of \"" + obj + "\" to " + value + " (not a valid " + propertyInfo.PropertyType + ")", e);
return false;
}
propertyInfo.SetValue(obj, enumVal);
}
else else
{ {
DebugConsole.ThrowError("Failed to set the value of the property \"" + Name + "\" of \"" + obj + "\" to " + value); DebugConsole.ThrowError("Failed to set the value of the property \"" + Name + "\" of \"" + obj + "\" to " + value);
@@ -106,11 +119,11 @@ namespace Barotrauma
{ {
if (value == null) return false; if (value == null) return false;
if (property.PropertyType!= value.GetType()) if (property.PropertyType != value.GetType())
{ {
DebugConsole.ThrowError("Failed to set the value of the property \""+Name+"\" of \""+obj.ToString()+"\" to "+value.ToString()); DebugConsole.ThrowError("Failed to set the value of the property \"" + Name + "\" of \"" + obj.ToString() + "\" to " + value.ToString());
DebugConsole.ThrowError("(Non-matching type, should be "+property.PropertyType+" instead of " +value.GetType()+")"); DebugConsole.ThrowError("(Non-matching type, should be " + property.PropertyType + " instead of " + value.GetType() + ")");
return false; return false;
} }