GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix EnumComboBox to support negative items as a cost of lack of uint64 support

Browse Source
This commit is contained in:
Wojtek Figat
2021-05-02 12:04:14 +02:00
parent 05c6a2214b
commit 28969a7de4
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Editor/GUI/EnumComboBox.cs
View File

@@ -29,7 +29,7 @@ namespace FlaxEditor.GUI
/// <summary>
/// The cached value from the UI.
/// </summary>
protected ulong _cachedValue;
protected long _cachedValue;
/// <summary>
/// True if has value cached, otherwise false.
@@ -54,7 +54,7 @@ namespace FlaxEditor.GUI
/// <summary>
/// The value.
/// </summary>
public ulong Value;
public long Value;
/// <summary>
/// Initializes a new instance of the <see cref="Entry"/> struct.
@@ -62,7 +62,7 @@ namespace FlaxEditor.GUI
/// <param name="name">The name.</param>
/// <param name="tooltip">The tooltip.</param>
/// <param name="value">The value.</param>
public Entry(string name, ulong value, string tooltip = null)
public Entry(string name, long value, string tooltip = null)
{
Name = name;
Tooltip = tooltip;
@@ -88,13 +88,13 @@ namespace FlaxEditor.GUI
public object EnumTypeValue
{
get => Enum.ToObject(_enumType, Value);
set => Value = Convert.ToUInt64(value);
set => Value = Convert.ToInt64(value);
}
/// <summary>
/// Gets or sets the value.
/// </summary>
public ulong Value
public long Value
{
get => _cachedValue;
set
@@ -209,7 +209,7 @@ namespace FlaxEditor.GUI
/// </summary>
protected void CacheValue()
{
ulong value = 0;
long value = 0;
if (IsFlags)
{
var selection = Selection;
@@ -276,7 +276,7 @@ namespace FlaxEditor.GUI
tooltip = tooltipAttr.Text;
}
entries.Add(new Entry(name, Convert.ToUInt64(field.GetRawConstantValue()), tooltip));
entries.Add(new Entry(name, Convert.ToInt64(field.GetRawConstantValue()), tooltip));
}
}
@@ -295,9 +295,9 @@ namespace FlaxEditor.GUI
}
// Calculate value that will be set after change
ulong valueAfter = 0;
long valueAfter = 0;
bool isSelected = _selectedIndices.Contains(index);
ulong selectedValue = entries[index].Value;
long selectedValue = entries[index].Value;
for (int i = 0; i < _selectedIndices.Count; i++)
{
int selectedIndex = _selectedIndices[i];

2
Source/Editor/Surface/Elements/EnumValue.cs
View File

@@ -32,7 +32,7 @@ namespace FlaxEditor.Surface.Elements
Width = archetype.Size.X;
ParentNode = parentNode;
Archetype = archetype;
Value = (ulong)(int)ParentNode.Values[Archetype.ValueIndex];
Value = (int)ParentNode.Values[Archetype.ValueIndex];
}
/// <inheritdoc />