chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: add warning, resolve a crash issue.

Browse Source
This commit is contained in:
rabbitism
2024-07-30 01:01:27 +08:00
parent f7dc4d356c
commit cbc17123ae
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
demo/Ursa.Demo/Pages/EnumSelectorDemo.axaml
View File

@@ -12,6 +12,7 @@
x:DataType="vm:EnumSelectorDemoViewModel" x:DataType="vm:EnumSelectorDemoViewModel"
mc:Ignorable="d"> mc:Ignorable="d">
<StackPanel> <StackPanel>
<u:Banner Type="Warning" Header="Native AOT non-compatible" Content="EnumSelector highly relies on reflection, it is not compatible with NativeAOT compilation. " Classes="Warning"></u:Banner>
<ToggleSwitch Name="description" Content="Show Description" /> <ToggleSwitch Name="description" Content="Show Description" />
<TextBlock Text="Select Type" /> <TextBlock Text="Select Type" />
<ComboBox <ComboBox

3
src/Ursa/Controls/EnumSelector/EnumSelector.cs
View File

@@ -91,9 +91,12 @@ public class EnumSelector: TemplatedControl
if (_updateFromComboBox) return; if (_updateFromComboBox) return;
var newValue = args.NewValue.Value; var newValue = args.NewValue.Value;
if (newValue is null) if (newValue is null)
{
if (Values?.Any() == true)
{ {
SetCurrentValue(SelectedValueProperty, null); SetCurrentValue(SelectedValueProperty, null);
} }
}
else else
{ {
if (newValue.GetType() != EnumType) if (newValue.GetType() != EnumType)