Fix for DefaultStyleKey not working always when assembly name differs from namespace.

azchohfi · azchohfi · commit 323e006837a6 · 2021-09-17T11:12:44.000-07:00
diff --git a/CommunityToolkit.WinUI.UI.Controls.Core/CameraPreview/CameraPreview.cs b/CommunityToolkit.WinUI.UI.Controls.Core/CameraPreview/CameraPreview.cs
@@ -77,6 +77,7 @@ public async Task StartAsync(CameraHelper cameraHelper)
         public CameraPreview()
         {
             this.DefaultStyleKey = typeof(CameraPreview);
+            this.DefaultStyleResourceUri = new Uri("ms-appx:///CommunityToolkit.WinUI.UI.Controls.Core/Themes/Generic.xaml");
         }
 
         /// <inheritdoc/>
diff --git a/CommunityToolkit.WinUI.UI.Controls.Core/DropShadowPanel/DropShadowPanel.cs b/CommunityToolkit.WinUI.UI.Controls.Core/DropShadowPanel/DropShadowPanel.cs
@@ -33,6 +33,7 @@ public partial class DropShadowPanel : ContentControl
         public DropShadowPanel()
         {
             this.DefaultStyleKey = typeof(DropShadowPanel);
+            this.DefaultStyleResourceUri = new Uri("ms-appx:///CommunityToolkit.WinUI.UI.Controls.Core/Themes/Generic.xaml");
 
             if (!DesignTimeHelpers.IsRunningInLegacyDesignerMode)
             {
diff --git a/CommunityToolkit.WinUI.UI.Controls.Core/ImageEx/ImageEx.cs b/CommunityToolkit.WinUI.UI.Controls.Core/ImageEx/ImageEx.cs
@@ -18,6 +18,7 @@ public ImageEx()
             : base()
         {
             DefaultStyleKey = typeof(ImageEx);
+            DefaultStyleResourceUri = new System.Uri("ms-appx:///CommunityToolkit.WinUI.UI.Controls.Core/Themes/Generic.xaml");
         }
     }
 }
diff --git a/CommunityToolkit.WinUI.UI.Controls.Core/InAppNotification/InAppNotification.cs b/CommunityToolkit.WinUI.UI.Controls.Core/InAppNotification/InAppNotification.cs
@@ -35,6 +35,7 @@ public partial class InAppNotification : ContentControl
         public InAppNotification()
         {
             DefaultStyleKey = typeof(InAppNotification);
+            DefaultStyleResourceUri = new Uri("ms-appx:///CommunityToolkit.WinUI.UI.Controls.Core/Themes/Generic.xaml");
 
             _dispatcherQueue = DispatcherQueue.GetForCurrentThread();
             _dismissTimer = _dispatcherQueue.CreateTimer();
diff --git a/CommunityToolkit.WinUI.UI.Controls.Core/Loading/Loading.cs b/CommunityToolkit.WinUI.UI.Controls.Core/Loading/Loading.cs
@@ -23,6 +23,7 @@ public partial class Loading : ContentControl
         public Loading()
         {
             DefaultStyleKey = typeof(Loading);
+            DefaultStyleResourceUri = new Uri("ms-appx:///CommunityToolkit.WinUI.UI.Controls.Core/Themes/Generic.xaml");
         }
 
         /// <inheritdoc/>
diff --git a/CommunityToolkit.WinUI.UI.Controls.Core/Menu/Menu.cs b/CommunityToolkit.WinUI.UI.Controls.Core/Menu/Menu.cs
@@ -24,6 +24,7 @@ public partial class Menu : ItemsControl
         public Menu()
         {
             DefaultStyleKey = typeof(Menu);
+            DefaultStyleResourceUri = new Uri("ms-appx:///CommunityToolkit.WinUI.UI.Controls.Core/Themes/Generic.xaml");
         }
 
         // even if we have multiple menus in the same page we need only one cache because only one menu item will have certain short cut.
diff --git a/CommunityToolkit.WinUI.UI.Controls.Core/MetadataControl/MetadataControl.cs b/CommunityToolkit.WinUI.UI.Controls.Core/MetadataControl/MetadataControl.cs
@@ -65,6 +65,7 @@ public sealed class MetadataControl : Control
         public MetadataControl()
         {
             DefaultStyleKey = typeof(MetadataControl);
+            DefaultStyleResourceUri = new System.Uri("ms-appx:///CommunityToolkit.WinUI.UI.Controls.Core/Themes/Generic.xaml");
             ActualThemeChanged += OnActualThemeChanged;
         }
 
diff --git a/CommunityToolkit.WinUI.UI.Controls.Core/RadialProgressBar/RadialProgressBar.cs b/CommunityToolkit.WinUI.UI.Controls.Core/RadialProgressBar/RadialProgressBar.cs
@@ -119,6 +119,7 @@ public Brush Outline
         public RadialProgressBar()
         {
             DefaultStyleKey = typeof(RadialProgressBar);
+            DefaultStyleResourceUri = new Uri("ms-appx:///CommunityToolkit.WinUI.UI.Controls.Core/Themes/Generic.xaml");
             SizeChanged += SizeChangedHandler;
         }
 
diff --git a/CommunityToolkit.WinUI.UI.Controls.Core/RotatorTile/RotatorTile.cs b/CommunityToolkit.WinUI.UI.Controls.Core/RotatorTile/RotatorTile.cs
@@ -84,6 +84,7 @@ public partial class RotatorTile : Control
         public RotatorTile()
         {
             DefaultStyleKey = typeof(RotatorTile);
+            DefaultStyleResourceUri = new Uri("ms-appx:///CommunityToolkit.WinUI.UI.Controls.Core/Themes/Generic.xaml");
 
             Unloaded += RotatorTile_Unloaded;
             Loaded += RotatorTile_Loaded;
diff --git a/CommunityToolkit.WinUI.UI.Controls.Core/TabbedCommandBar/TabbedCommandBar.cs b/CommunityToolkit.WinUI.UI.Controls.Core/TabbedCommandBar/TabbedCommandBar.cs
@@ -38,7 +38,7 @@ public class TabbedCommandBar : NavigationView
         public TabbedCommandBar()
         {
             DefaultStyleKey = typeof(TabbedCommandBar);
-            DefaultStyleResourceUri = new System.Uri("ms-appx:///CommunityToolkit.WinUI.UI.Controls.Core/Themes/Generic.xaml");
+            DefaultStyleResourceUri = new Uri("ms-appx:///CommunityToolkit.WinUI.UI.Controls.Core/Themes/Generic.xaml");
 
             SelectionChanged += SelectedItemChanged;
             Loaded += TabbedCommandBar_Loaded;
diff --git a/CommunityToolkit.WinUI.UI.Controls.Core/TabbedCommandBar/TabbedCommandBarItem.cs b/CommunityToolkit.WinUI.UI.Controls.Core/TabbedCommandBar/TabbedCommandBarItem.cs
@@ -23,6 +23,7 @@ public class TabbedCommandBarItem : CommandBar
         public TabbedCommandBarItem()
         {
             DefaultStyleKey = typeof(TabbedCommandBarItem);
+            DefaultStyleResourceUri = new System.Uri("ms-appx:///CommunityToolkit.WinUI.UI.Controls.Core/Themes/Generic.xaml");
         }
 
         /// <summary>
diff --git a/CommunityToolkit.WinUI.UI.Controls.Core/TextToolbar/TextToolbar.cs b/CommunityToolkit.WinUI.UI.Controls.Core/TextToolbar/TextToolbar.cs
@@ -30,6 +30,7 @@ public partial class TextToolbar : Control
         public TextToolbar()
         {
             DefaultStyleKey = typeof(TextToolbar);
+            DefaultStyleResourceUri = new Uri("ms-appx:///CommunityToolkit.WinUI.UI.Controls.Core/Themes/Generic.xaml");
 
             CustomButtons = new ButtonMap();
             ButtonModifications = new DefaultButtonModificationList();
diff --git a/CommunityToolkit.WinUI.UI.Controls.Core/TileControl/TileControl.cs b/CommunityToolkit.WinUI.UI.Controls.Core/TileControl/TileControl.cs
@@ -66,6 +66,7 @@ public partial class TileControl : ContentControl
         public TileControl()
         {
             DefaultStyleKey = typeof(TileControl);
+            DefaultStyleResourceUri = new Uri("ms-appx:///CommunityToolkit.WinUI.UI.Controls.Core/Themes/Generic.xaml");
 
             InitializeAnimation();
         }

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ public async Task StartAsync(CameraHelper cameraHelper)`
`77`	`77`	`public CameraPreview()`
`78`	`78`	`{`
`79`	`79`	`this.DefaultStyleKey = typeof(CameraPreview);`
	`80`	`+ this.DefaultStyleResourceUri = new Uri("ms-appx:///CommunityToolkit.WinUI.UI.Controls.Core/Themes/Generic.xaml");`
`80`	`81`	`}`
`81`	`82`
`82`	`83`	`/// <inheritdoc/>`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ public partial class DropShadowPanel : ContentControl`
`33`	`33`	`public DropShadowPanel()`
`34`	`34`	`{`
`35`	`35`	`this.DefaultStyleKey = typeof(DropShadowPanel);`
	`36`	`+ this.DefaultStyleResourceUri = new Uri("ms-appx:///CommunityToolkit.WinUI.UI.Controls.Core/Themes/Generic.xaml");`
`36`	`37`
`37`	`38`	`if (!DesignTimeHelpers.IsRunningInLegacyDesignerMode)`
`38`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ public ImageEx()`
`18`	`18`	`: base()`
`19`	`19`	`{`
`20`	`20`	`DefaultStyleKey = typeof(ImageEx);`
	`21`	`+ DefaultStyleResourceUri = new System.Uri("ms-appx:///CommunityToolkit.WinUI.UI.Controls.Core/Themes/Generic.xaml");`
`21`	`22`	`}`
`22`	`23`	`}`
`23`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ public partial class InAppNotification : ContentControl`
`35`	`35`	`public InAppNotification()`
`36`	`36`	`{`
`37`	`37`	`DefaultStyleKey = typeof(InAppNotification);`
	`38`	`+ DefaultStyleResourceUri = new Uri("ms-appx:///CommunityToolkit.WinUI.UI.Controls.Core/Themes/Generic.xaml");`
`38`	`39`
`39`	`40`	`_dispatcherQueue = DispatcherQueue.GetForCurrentThread();`
`40`	`41`	`_dismissTimer = _dispatcherQueue.CreateTimer();`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ public partial class Loading : ContentControl`
`23`	`23`	`public Loading()`
`24`	`24`	`{`
`25`	`25`	`DefaultStyleKey = typeof(Loading);`
	`26`	`+ DefaultStyleResourceUri = new Uri("ms-appx:///CommunityToolkit.WinUI.UI.Controls.Core/Themes/Generic.xaml");`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`/// <inheritdoc/>`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ public partial class Menu : ItemsControl`
`24`	`24`	`public Menu()`
`25`	`25`	`{`
`26`	`26`	`DefaultStyleKey = typeof(Menu);`
	`27`	`+ DefaultStyleResourceUri = new Uri("ms-appx:///CommunityToolkit.WinUI.UI.Controls.Core/Themes/Generic.xaml");`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`// even if we have multiple menus in the same page we need only one cache because only one menu item will have certain short cut.`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ public sealed class MetadataControl : Control`
`65`	`65`	`public MetadataControl()`
`66`	`66`	`{`
`67`	`67`	`DefaultStyleKey = typeof(MetadataControl);`
	`68`	`+ DefaultStyleResourceUri = new System.Uri("ms-appx:///CommunityToolkit.WinUI.UI.Controls.Core/Themes/Generic.xaml");`
`68`	`69`	`ActualThemeChanged += OnActualThemeChanged;`
`69`	`70`	`}`
`70`	`71`
Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,7 @@ public Brush Outline`
`119`	`119`	`public RadialProgressBar()`
`120`	`120`	`{`
`121`	`121`	`DefaultStyleKey = typeof(RadialProgressBar);`
	`122`	`+ DefaultStyleResourceUri = new Uri("ms-appx:///CommunityToolkit.WinUI.UI.Controls.Core/Themes/Generic.xaml");`
`122`	`123`	`SizeChanged += SizeChangedHandler;`
`123`	`124`	`}`
`124`	`125`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@ public partial class RotatorTile : Control`
`84`	`84`	`public RotatorTile()`
`85`	`85`	`{`
`86`	`86`	`DefaultStyleKey = typeof(RotatorTile);`
	`87`	`+ DefaultStyleResourceUri = new Uri("ms-appx:///CommunityToolkit.WinUI.UI.Controls.Core/Themes/Generic.xaml");`
`87`	`88`
`88`	`89`	`Unloaded += RotatorTile_Unloaded;`
`89`	`90`	`Loaded += RotatorTile_Loaded;`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public class TabbedCommandBar : NavigationView`
`38`	`38`	`public TabbedCommandBar()`
`39`	`39`	`{`
`40`	`40`	`DefaultStyleKey = typeof(TabbedCommandBar);`
`41`		`- DefaultStyleResourceUri = new System.Uri("ms-appx:///CommunityToolkit.WinUI.UI.Controls.Core/Themes/Generic.xaml");`
	`41`	`+ DefaultStyleResourceUri = new Uri("ms-appx:///CommunityToolkit.WinUI.UI.Controls.Core/Themes/Generic.xaml");`
`42`	`42`
`43`	`43`	`SelectionChanged += SelectedItemChanged;`
`44`	`44`	`Loaded += TabbedCommandBar_Loaded;`