Fix SettingsGroup AOT/Trim Crash

ghost1372 · Nov 25, 2024 · ad0e13d · ad0e13d
1 parent c2c04cb
commit ad0e13d
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 8 deletions.
diff --git a/dev/DevWinUI.Controls/Controls/SettingsGroup/SettingsGroup/SettingGroup.Property.cs b/dev/DevWinUI.Controls/Controls/SettingsGroup/SettingsGroup/SettingGroup.Property.cs
@@ -4,6 +4,18 @@
 namespace DevWinUI;
 public partial class SettingsGroup : Control
 {
+    internal CornerRadius RootGridCornerRadius
+    {
+        get { return (CornerRadius)GetValue(RootGridCornerRadiusProperty); }
+        set { SetValue(RootGridCornerRadiusProperty, value); }
+    }
+
+    internal static readonly DependencyProperty RootGridCornerRadiusProperty =
+        DependencyProperty.Register(nameof(RootGridCornerRadius), typeof(CornerRadius), typeof(SettingsGroup), new PropertyMetadata(new CornerRadius(0)));
+    private CornerRadius GetRootGridCornerRadius()
+    {
+        return (CornerRadius)new Bool2CornerRadiusConverter().Convert(Items?.Count, null, null, null);
+    }
     public ObservableCollection<object> Items
     {
         get { return (ObservableCollection<object>)GetValue(ItemsProperty); }
@@ -25,13 +37,10 @@ private void OnItemsChanged()
     {
         if (_itemsRepeater is not null)
         {
-            Bool2CornerRadiusConverter bool2CornerRadiusConverter = new Bool2CornerRadiusConverter();
-            var cornerRadius = bool2CornerRadiusConverter.Convert(Items.Count, null, null, null);
-
+            RootGridCornerRadius = GetRootGridCornerRadius();
             if (_rootGrid != null)
             {
-                _rootGrid.CornerRadius = (CornerRadius)cornerRadius;
-
+                _rootGrid.CornerRadius = GetRootGridCornerRadius();
             }
 
             foreach (var item in Items)

diff --git a/dev/DevWinUI.Controls/Controls/SettingsGroup/SettingsGroup/SettingsGroup.cs b/dev/DevWinUI.Controls/Controls/SettingsGroup/SettingsGroup/SettingsGroup.cs
@@ -57,6 +57,7 @@ protected override void OnApplyTemplate()
         OnHeaderChanged();
         OnDescriptionChanged();
         OnContentChanged();
+        RootGridCornerRadius = GetRootGridCornerRadius();
         base.OnApplyTemplate();
     }
 

diff --git a/dev/DevWinUI.Controls/Themes/Generic.xaml b/dev/DevWinUI.Controls/Themes/Generic.xaml
@@ -3825,7 +3825,7 @@ Themes\Styles\Win2D\Watermark.xaml
                 </VisualState>
               </VisualStateGroup>
             </VisualStateManager.VisualStateGroups>
-            <Grid x:Name="PART_RootGrid" Grid.Row="0" MinHeight="{ThemeResource SettingsCardMinHeight}" Padding="{ThemeResource SettingsCardPadding}" Background="{ThemeResource SettingsCardBackground}" BackgroundSizing="InnerBorderEdge" BorderBrush="{ThemeResource SettingsCardBorderBrush}" BorderThickness="{ThemeResource SettingsCardBorderThickness}" CornerRadius="{Binding Items.Count, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource Bool2CornerRadiusConverter}}">
+            <Grid x:Name="PART_RootGrid" Grid.Row="0" MinHeight="{ThemeResource SettingsCardMinHeight}" Padding="{ThemeResource SettingsCardPadding}" Background="{ThemeResource SettingsCardBackground}" BackgroundSizing="InnerBorderEdge" BorderBrush="{ThemeResource SettingsCardBorderBrush}" BorderThickness="{ThemeResource SettingsCardBorderThickness}">
               <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />

diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/SettingsGroup.xaml b/dev/DevWinUI.Controls/Themes/Styles/Controls/SettingsGroup.xaml
@@ -52,8 +52,7 @@
                               Background="{ThemeResource SettingsCardBackground}"
                               BackgroundSizing="InnerBorderEdge"
                               BorderBrush="{ThemeResource SettingsCardBorderBrush}"
-                              BorderThickness="{ThemeResource SettingsCardBorderThickness}"
-                              CornerRadius="{Binding Items.Count, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource Bool2CornerRadiusConverter}}">
+                              BorderThickness="{ThemeResource SettingsCardBorderThickness}">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
                                 <RowDefinition Height="Auto" />

diff --git a/...iews/Pages/Features/SettingsControls.xaml → ...iews/Pages/Settings/SettingsControls.xaml b/...iews/Pages/Features/SettingsControls.xaml → ...iews/Pages/Settings/SettingsControls.xaml
diff --git a/...s/Pages/Features/SettingsControls.xaml.cs → ...s/Pages/Settings/SettingsControls.xaml.cs b/...s/Pages/Features/SettingsControls.xaml.cs → ...s/Pages/Settings/SettingsControls.xaml.cs
diff --git a/...y/Views/Pages/Features/SettingsGroup.xaml → ...y/Views/Pages/Settings/SettingsGroup.xaml b/...y/Views/Pages/Features/SettingsGroup.xaml → ...y/Views/Pages/Settings/SettingsGroup.xaml
diff --git a/...iews/Pages/Features/SettingsGroup.xaml.cs → ...iews/Pages/Settings/SettingsGroup.xaml.cs b/...iews/Pages/Features/SettingsGroup.xaml.cs → ...iews/Pages/Settings/SettingsGroup.xaml.cs