Merge pull request #671 from irihitech/enum

Ensure initial state is respected in EnumSelector
This commit is contained in:
Zhang Dian
2025-05-30 14:22:59 +08:00
committed by GitHub
4 changed files with 51 additions and 46 deletions

View File

@@ -34,6 +34,7 @@ public class EnumSelector: TemplatedControl
private static object? OnValueCoerce(AvaloniaObject o, object? value)
{
if (o is not EnumSelector selector) return null;
if (!selector.IsInitialized) return value;
if (value is null) return null;
if (value.GetType() != selector.EnumType) return null;
var first = selector.Values?.FirstOrDefault(a => Equals(a.Value, value));
@@ -128,6 +129,8 @@ public class EnumSelector: TemplatedControl
return;
}
Values = GenerateItemTuple();
var first = Values?.FirstOrDefault(a => Equals(a.Value, this.Value));
SetCurrentValue(SelectedValueProperty, first);
}
// netstandard 2.0 does not support Enum.GetValuesAsUnderlyingType, which is used for native aot compilation