diff --git a/src/Avalonia.Controls/Page/CarouselPage.cs b/src/Avalonia.Controls/Page/CarouselPage.cs index 1b640fd528..22bee65871 100644 --- a/src/Avalonia.Controls/Page/CarouselPage.cs +++ b/src/Avalonia.Controls/Page/CarouselPage.cs @@ -1,6 +1,6 @@ +using System; using System.Collections; using System.Collections.Generic; -using System.Linq; using Avalonia.Animation; using Avalonia.Automation; using Avalonia.Automation.Peers; @@ -11,7 +11,6 @@ using Avalonia.Controls.Primitives; using Avalonia.Controls.Templates; using Avalonia.Input; using Avalonia.Interactivity; -using Avalonia.Media; using Avalonia.Threading; namespace Avalonia.Controls @@ -111,6 +110,8 @@ namespace Avalonia.Controls set => SetValue(IsKeyboardNavigationEnabledProperty, value); } + protected override Type StyleKeyOverride => typeof(CarouselPage); + protected override void OnApplyTemplate(TemplateAppliedEventArgs e) { base.OnApplyTemplate(e); diff --git a/src/Avalonia.Controls/Page/DrawerPage.cs b/src/Avalonia.Controls/Page/DrawerPage.cs index 954ec9c918..f8e039f8cd 100644 --- a/src/Avalonia.Controls/Page/DrawerPage.cs +++ b/src/Avalonia.Controls/Page/DrawerPage.cs @@ -535,6 +535,8 @@ namespace Avalonia.Controls set => SetValue(DisplayModeProperty, value); } + protected override Type StyleKeyOverride => typeof(DrawerPage); + protected override void OnApplyTemplate(TemplateAppliedEventArgs e) { base.OnApplyTemplate(e); diff --git a/src/Avalonia.Controls/Page/NavigationPage.cs b/src/Avalonia.Controls/Page/NavigationPage.cs index e736535e75..525851af89 100644 --- a/src/Avalonia.Controls/Page/NavigationPage.cs +++ b/src/Avalonia.Controls/Page/NavigationPage.cs @@ -1,5 +1,4 @@ using System; -using System.Collections; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; @@ -7,14 +6,13 @@ using Avalonia.Animation; using Avalonia.Automation; using Avalonia.Automation.Peers; using Avalonia.Controls.Metadata; -using Avalonia.Logging; -using Avalonia.LogicalTree; using Avalonia.Controls.Presenters; using Avalonia.Controls.Primitives; -using Avalonia.Controls.Shapes; using Avalonia.Input; using Avalonia.Input.GestureRecognizers; using Avalonia.Interactivity; +using Avalonia.Logging; +using Avalonia.LogicalTree; using Avalonia.Media; using Avalonia.Metadata; using Avalonia.Reactive; @@ -619,6 +617,8 @@ namespace Avalonia.Controls } } + protected override Type StyleKeyOverride => typeof(NavigationPage); + protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change) { if (change.Property == PagesProperty && diff --git a/src/Avalonia.Controls/Page/TabbedPage.cs b/src/Avalonia.Controls/Page/TabbedPage.cs index 69815eb56a..89e926dc3c 100644 --- a/src/Avalonia.Controls/Page/TabbedPage.cs +++ b/src/Avalonia.Controls/Page/TabbedPage.cs @@ -9,7 +9,6 @@ using Avalonia.Controls.Primitives; using Avalonia.Controls.Templates; using Avalonia.Input; using Avalonia.Input.GestureRecognizers; -using Avalonia.LogicalTree; using Avalonia.Threading; namespace Avalonia.Controls @@ -150,6 +149,8 @@ namespace Avalonia.Controls set => SetValue(IndicatorTemplateProperty, value); } + protected override Type StyleKeyOverride => typeof(TabbedPage); + protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e) { base.OnAttachedToVisualTree(e);