Fix ElementGroup AOT

ghost1372 · ghost1372 · commit e2b8f08a1258 · 2025-07-16T17:44:28.000+03:30
diff --git a/dev/DevWinUI.Controls/Controls/Others/ElementGroup.cs b/dev/DevWinUI.Controls/Controls/Others/ElementGroup.cs
@@ -1,4 +1,5 @@
-﻿using Microsoft.UI.Xaml.Markup;
+﻿using System.Diagnostics.CodeAnalysis;
+using Microsoft.UI.Xaml.Markup;
 
 namespace DevWinUI;
 public partial class ElementGroup : ItemsControl
@@ -21,15 +22,16 @@ private static void OnOrientationChanged(DependencyObject d, DependencyPropertyC
         }
     }
 
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(ItemsPanelTemplate))]
     private void UpdateOrientation()
     {
         if (Orientation == Orientation.Horizontal)
         {
-            ItemsPanel = (ItemsPanelTemplate)XamlReader.Load("<ItemsPanelTemplate xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation'><StackPanel Orientation='Horizontal'/></ItemsPanelTemplate>");
+            ItemsPanel = Application.Current.Resources["ElementGroupHorizontalItemsPanel"] as ItemsPanelTemplate;
         }
         else
         {
-            ItemsPanel = (ItemsPanelTemplate)XamlReader.Load("<ItemsPanelTemplate xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation'><StackPanel Orientation='Vertical'/></ItemsPanelTemplate>");
+            ItemsPanel = Application.Current.Resources["ElementGroupVerticalItemsPanel"] as ItemsPanelTemplate;
         }
         UpdateElements();
     }
diff --git a/dev/DevWinUI.Controls/Themes/Styles/CommonStyles/Common.xaml b/dev/DevWinUI.Controls/Themes/Styles/CommonStyles/Common.xaml
@@ -2,6 +2,13 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="using:DevWinUI">
 
+    <ItemsPanelTemplate x:Key="ElementGroupHorizontalItemsPanel">
+        <StackPanel Orientation="Horizontal" />
+    </ItemsPanelTemplate>
+    <ItemsPanelTemplate x:Key="ElementGroupVerticalItemsPanel">
+        <StackPanel Orientation="Vertical" />
+    </ItemsPanelTemplate>
+
     <ThemeShadow x:Name="ThemeShadow" />
     <x:Double x:Key="SettingActionControlMinWidth">240</x:Double>
 
diff --git a/dev/DevWinUI.Gallery/Views/Pages/Features/ElementGroupPage.xaml.cs b/dev/DevWinUI.Gallery/Views/Pages/Features/ElementGroupPage.xaml.cs
@@ -1,4 +1,6 @@
-﻿namespace DevWinUIGallery.Views;
+﻿using WinRT;
+
+namespace DevWinUIGallery.Views;
 
 public sealed partial class ElementGroupPage : Page
 {
@@ -11,7 +13,7 @@ private void CmbOrientation_SelectionChanged(object sender, SelectionChangedEven
     {
         if (ElementGroupSample != null && ElementGroupSample2 != null && ElementGroupSample3 != null)
         {
-            var item = CmbOrientation.SelectedItem as ComboBoxItem;
+            var item = CmbOrientation.SelectedItem.As<ComboBoxItem>();
             var orientation = GeneralHelper.GetEnum<Orientation>(item.Tag.ToString());
             ElementGroupSample.Orientation = orientation;
             ElementGroupSample2.Orientation = orientation;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using Microsoft.UI.Xaml.Markup;`
	`1`	`+using System.Diagnostics.CodeAnalysis;`
	`2`	`+using Microsoft.UI.Xaml.Markup;`
`2`	`3`
`3`	`4`	`namespace DevWinUI;`
`4`	`5`	`public partial class ElementGroup : ItemsControl`
`@@ -21,15 +22,16 @@ private static void OnOrientationChanged(DependencyObject d, DependencyPropertyC`
`21`	`22`	`}`
`22`	`23`	`}`
`23`	`24`
	`25`	`+ [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(ItemsPanelTemplate))]`
`24`	`26`	`private void UpdateOrientation()`
`25`	`27`	`{`
`26`	`28`	`if (Orientation == Orientation.Horizontal)`
`27`	`29`	`{`
`28`		`- ItemsPanel = (ItemsPanelTemplate)XamlReader.Load("<ItemsPanelTemplate xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation'><StackPanel Orientation='Horizontal'/></ItemsPanelTemplate>");`
	`30`	`+ ItemsPanel = Application.Current.Resources["ElementGroupHorizontalItemsPanel"] as ItemsPanelTemplate;`
`29`	`31`	`}`
`30`	`32`	`else`
`31`	`33`	`{`
`32`		`- ItemsPanel = (ItemsPanelTemplate)XamlReader.Load("<ItemsPanelTemplate xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation'><StackPanel Orientation='Vertical'/></ItemsPanelTemplate>");`
	`34`	`+ ItemsPanel = Application.Current.Resources["ElementGroupVerticalItemsPanel"] as ItemsPanelTemplate;`
`33`	`35`	`}`
`34`	`36`	`UpdateElements();`
`35`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-namespace DevWinUIGallery.Views;`
	`1`	`+using WinRT;`
	`2`	`+`
	`3`	`+namespace DevWinUIGallery.Views;`
`2`	`4`
`3`	`5`	`public sealed partial class ElementGroupPage : Page`
`4`	`6`	`{`
`@@ -11,7 +13,7 @@ private void CmbOrientation_SelectionChanged(object sender, SelectionChangedEven`
`11`	`13`	`{`
`12`	`14`	`if (ElementGroupSample != null && ElementGroupSample2 != null && ElementGroupSample3 != null)`
`13`	`15`	`{`
`14`		`- var item = CmbOrientation.SelectedItem as ComboBoxItem;`
	`16`	`+ var item = CmbOrientation.SelectedItem.As<ComboBoxItem>();`
`15`	`17`	`var orientation = GeneralHelper.GetEnum<Orientation>(item.Tag.ToString());`
`16`	`18`	`ElementGroupSample.Orientation = orientation;`
`17`	`19`	`ElementGroupSample2.Orientation = orientation;`