Browse Source

add style overrides for other page types (#20985)

pull/20987/head
Emmanuel Hansen 6 months ago
committed by GitHub
parent
commit
bd041f225c
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 5
      src/Avalonia.Controls/Page/CarouselPage.cs
  2. 2
      src/Avalonia.Controls/Page/DrawerPage.cs
  3. 8
      src/Avalonia.Controls/Page/NavigationPage.cs
  4. 3
      src/Avalonia.Controls/Page/TabbedPage.cs

5
src/Avalonia.Controls/Page/CarouselPage.cs

@ -1,6 +1,6 @@
using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using Avalonia.Animation; using Avalonia.Animation;
using Avalonia.Automation; using Avalonia.Automation;
using Avalonia.Automation.Peers; using Avalonia.Automation.Peers;
@ -11,7 +11,6 @@ using Avalonia.Controls.Primitives;
using Avalonia.Controls.Templates; using Avalonia.Controls.Templates;
using Avalonia.Input; using Avalonia.Input;
using Avalonia.Interactivity; using Avalonia.Interactivity;
using Avalonia.Media;
using Avalonia.Threading; using Avalonia.Threading;
namespace Avalonia.Controls namespace Avalonia.Controls
@ -111,6 +110,8 @@ namespace Avalonia.Controls
set => SetValue(IsKeyboardNavigationEnabledProperty, value); set => SetValue(IsKeyboardNavigationEnabledProperty, value);
} }
protected override Type StyleKeyOverride => typeof(CarouselPage);
protected override void OnApplyTemplate(TemplateAppliedEventArgs e) protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
{ {
base.OnApplyTemplate(e); base.OnApplyTemplate(e);

2
src/Avalonia.Controls/Page/DrawerPage.cs

@ -535,6 +535,8 @@ namespace Avalonia.Controls
set => SetValue(DisplayModeProperty, value); set => SetValue(DisplayModeProperty, value);
} }
protected override Type StyleKeyOverride => typeof(DrawerPage);
protected override void OnApplyTemplate(TemplateAppliedEventArgs e) protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
{ {
base.OnApplyTemplate(e); base.OnApplyTemplate(e);

8
src/Avalonia.Controls/Page/NavigationPage.cs

@ -1,5 +1,4 @@
using System; using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -7,14 +6,13 @@ using Avalonia.Animation;
using Avalonia.Automation; using Avalonia.Automation;
using Avalonia.Automation.Peers; using Avalonia.Automation.Peers;
using Avalonia.Controls.Metadata; using Avalonia.Controls.Metadata;
using Avalonia.Logging;
using Avalonia.LogicalTree;
using Avalonia.Controls.Presenters; using Avalonia.Controls.Presenters;
using Avalonia.Controls.Primitives; using Avalonia.Controls.Primitives;
using Avalonia.Controls.Shapes;
using Avalonia.Input; using Avalonia.Input;
using Avalonia.Input.GestureRecognizers; using Avalonia.Input.GestureRecognizers;
using Avalonia.Interactivity; using Avalonia.Interactivity;
using Avalonia.Logging;
using Avalonia.LogicalTree;
using Avalonia.Media; using Avalonia.Media;
using Avalonia.Metadata; using Avalonia.Metadata;
using Avalonia.Reactive; using Avalonia.Reactive;
@ -619,6 +617,8 @@ namespace Avalonia.Controls
} }
} }
protected override Type StyleKeyOverride => typeof(NavigationPage);
protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change) protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
{ {
if (change.Property == PagesProperty && if (change.Property == PagesProperty &&

3
src/Avalonia.Controls/Page/TabbedPage.cs

@ -9,7 +9,6 @@ using Avalonia.Controls.Primitives;
using Avalonia.Controls.Templates; using Avalonia.Controls.Templates;
using Avalonia.Input; using Avalonia.Input;
using Avalonia.Input.GestureRecognizers; using Avalonia.Input.GestureRecognizers;
using Avalonia.LogicalTree;
using Avalonia.Threading; using Avalonia.Threading;
namespace Avalonia.Controls namespace Avalonia.Controls
@ -150,6 +149,8 @@ namespace Avalonia.Controls
set => SetValue(IndicatorTemplateProperty, value); set => SetValue(IndicatorTemplateProperty, value);
} }
protected override Type StyleKeyOverride => typeof(TabbedPage);
protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e) protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
{ {
base.OnAttachedToVisualTree(e); base.OnAttachedToVisualTree(e);

Loading…
Cancel
Save