diff --git a/api/Avalonia.nupkg.xml b/api/Avalonia.nupkg.xml
index 44617ccf64..63e8234919 100644
--- a/api/Avalonia.nupkg.xml
+++ b/api/Avalonia.nupkg.xml
@@ -409,6 +409,12 @@
baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll
current/Avalonia/lib/net10.0/Avalonia.Controls.dll
+
+ CP0001
+ T:Avalonia.Controls.Primitives.SelectionHandleType
+ baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll
+ current/Avalonia/lib/net10.0/Avalonia.Controls.dll
+
CP0001
T:Avalonia.Controls.Remote.RemoteServer
@@ -883,6 +889,12 @@
baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll
current/Avalonia/lib/net8.0/Avalonia.Controls.dll
+
+ CP0001
+ T:Avalonia.Controls.Primitives.SelectionHandleType
+ baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll
+ current/Avalonia/lib/net8.0/Avalonia.Controls.dll
+
CP0001
T:Avalonia.Controls.Remote.RemoteServer
@@ -979,6 +991,18 @@
baseline/Avalonia/lib/net10.0/Avalonia.Base.dll
current/Avalonia/lib/net10.0/Avalonia.Base.dll
+
+ CP0002
+ F:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.CrossAxisCancelThresholdProperty
+ baseline/Avalonia/lib/net10.0/Avalonia.Base.dll
+ current/Avalonia/lib/net10.0/Avalonia.Base.dll
+
+
+ CP0002
+ F:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.EdgeSizeProperty
+ baseline/Avalonia/lib/net10.0/Avalonia.Base.dll
+ current/Avalonia/lib/net10.0/Avalonia.Base.dll
+
CP0002
F:Avalonia.Input.HoldingState.Cancelled
@@ -1105,12 +1129,72 @@
baseline/Avalonia/lib/net10.0/Avalonia.Base.dll
current/Avalonia/lib/net10.0/Avalonia.Base.dll
+
+ CP0002
+ M:Avalonia.Input.FocusManager.#ctor(Avalonia.Input.IInputElement)
+ baseline/Avalonia/lib/net10.0/Avalonia.Base.dll
+ current/Avalonia/lib/net10.0/Avalonia.Base.dll
+
+
+ CP0002
+ M:Avalonia.Input.FocusManager.ClearFocus
+ baseline/Avalonia/lib/net10.0/Avalonia.Base.dll
+ current/Avalonia/lib/net10.0/Avalonia.Base.dll
+
+
+ CP0002
+ M:Avalonia.Input.FocusManager.ClearFocusOnElementRemoved(Avalonia.Input.IInputElement,Avalonia.Visual)
+ baseline/Avalonia/lib/net10.0/Avalonia.Base.dll
+ current/Avalonia/lib/net10.0/Avalonia.Base.dll
+
+
+ CP0002
+ M:Avalonia.Input.FocusManager.FindNextElement(Avalonia.Input.NavigationDirection)
+ baseline/Avalonia/lib/net10.0/Avalonia.Base.dll
+ current/Avalonia/lib/net10.0/Avalonia.Base.dll
+
+
+ CP0002
+ M:Avalonia.Input.FocusManager.TryMoveFocus(Avalonia.Input.NavigationDirection)
+ baseline/Avalonia/lib/net10.0/Avalonia.Base.dll
+ current/Avalonia/lib/net10.0/Avalonia.Base.dll
+
+
+ CP0002
+ M:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.get_CrossAxisCancelThreshold
+ baseline/Avalonia/lib/net10.0/Avalonia.Base.dll
+ current/Avalonia/lib/net10.0/Avalonia.Base.dll
+
+
+ CP0002
+ M:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.get_EdgeSize
+ baseline/Avalonia/lib/net10.0/Avalonia.Base.dll
+ current/Avalonia/lib/net10.0/Avalonia.Base.dll
+
+
+ CP0002
+ M:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.set_CrossAxisCancelThreshold(System.Double)
+ baseline/Avalonia/lib/net10.0/Avalonia.Base.dll
+ current/Avalonia/lib/net10.0/Avalonia.Base.dll
+
+
+ CP0002
+ M:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.set_EdgeSize(System.Double)
+ baseline/Avalonia/lib/net10.0/Avalonia.Base.dll
+ current/Avalonia/lib/net10.0/Avalonia.Base.dll
+
CP0002
M:Avalonia.Input.HoldingRoutedEventArgs.#ctor(Avalonia.Input.HoldingState,Avalonia.Point,Avalonia.Input.PointerType)
baseline/Avalonia/lib/net10.0/Avalonia.Base.dll
current/Avalonia/lib/net10.0/Avalonia.Base.dll
+
+ CP0002
+ M:Avalonia.Input.IFocusManager.ClearFocus
+ baseline/Avalonia/lib/net10.0/Avalonia.Base.dll
+ current/Avalonia/lib/net10.0/Avalonia.Base.dll
+
CP0002
M:Avalonia.Input.IInputRoot.get_KeyboardNavigationHandler
@@ -1363,6 +1447,18 @@
baseline/Avalonia/lib/net10.0/Avalonia.Base.dll
current/Avalonia/lib/net10.0/Avalonia.Base.dll
+
+ CP0002
+ M:Avalonia.Input.SwipeGestureEventArgs.#ctor(System.Int32,Avalonia.Input.SwipeDirection,Avalonia.Vector,Avalonia.Point)
+ baseline/Avalonia/lib/net10.0/Avalonia.Base.dll
+ current/Avalonia/lib/net10.0/Avalonia.Base.dll
+
+
+ CP0002
+ M:Avalonia.Input.SwipeGestureEventArgs.get_StartPoint
+ baseline/Avalonia/lib/net10.0/Avalonia.Base.dll
+ current/Avalonia/lib/net10.0/Avalonia.Base.dll
+
CP0002
M:Avalonia.Input.TextInput.TextInputMethodClient.ShowInputPanel
@@ -2077,12 +2173,36 @@
baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll
current/Avalonia/lib/net10.0/Avalonia.Controls.dll
+
+ CP0002
+ M:Avalonia.Controls.Primitives.TextSearch.GetText(Avalonia.Interactivity.Interactive)
+ baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll
+ current/Avalonia/lib/net10.0/Avalonia.Controls.dll
+
+
+ CP0002
+ M:Avalonia.Controls.Primitives.TextSearch.GetTextBinding(Avalonia.Interactivity.Interactive)
+ baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll
+ current/Avalonia/lib/net10.0/Avalonia.Controls.dll
+
CP0002
M:Avalonia.Controls.Primitives.TextSearch.SetText(Avalonia.Controls.Control,System.String)
baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll
current/Avalonia/lib/net10.0/Avalonia.Controls.dll
+
+ CP0002
+ M:Avalonia.Controls.Primitives.TextSearch.SetText(Avalonia.Interactivity.Interactive,System.String)
+ baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll
+ current/Avalonia/lib/net10.0/Avalonia.Controls.dll
+
+
+ CP0002
+ M:Avalonia.Controls.Primitives.TextSearch.SetTextBinding(Avalonia.Interactivity.Interactive,Avalonia.Data.BindingBase)
+ baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll
+ current/Avalonia/lib/net10.0/Avalonia.Controls.dll
+
CP0002
M:Avalonia.Controls.Primitives.ToggleButton.add_Checked(System.EventHandler{Avalonia.Interactivity.RoutedEventArgs})
@@ -2149,6 +2269,12 @@
baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll
current/Avalonia/lib/net10.0/Avalonia.Controls.dll
+
+ CP0002
+ M:Avalonia.Controls.Primitives.VisualLayerManager.get_IsPopup
+ baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll
+ current/Avalonia/lib/net10.0/Avalonia.Controls.dll
+
CP0002
M:Avalonia.Controls.Primitives.VisualLayerManager.get_LightDismissOverlayLayer
@@ -2167,6 +2293,12 @@
baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll
current/Avalonia/lib/net10.0/Avalonia.Controls.dll
+
+ CP0002
+ M:Avalonia.Controls.Primitives.VisualLayerManager.set_IsPopup(System.Boolean)
+ baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll
+ current/Avalonia/lib/net10.0/Avalonia.Controls.dll
+
CP0002
M:Avalonia.Controls.Screens.ScreenFromWindow(Avalonia.Platform.IWindowBaseImpl)
@@ -2473,6 +2605,18 @@
baseline/Avalonia/lib/net8.0/Avalonia.Base.dll
current/Avalonia/lib/net8.0/Avalonia.Base.dll
+
+ CP0002
+ F:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.CrossAxisCancelThresholdProperty
+ baseline/Avalonia/lib/net8.0/Avalonia.Base.dll
+ current/Avalonia/lib/net8.0/Avalonia.Base.dll
+
+
+ CP0002
+ F:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.EdgeSizeProperty
+ baseline/Avalonia/lib/net8.0/Avalonia.Base.dll
+ current/Avalonia/lib/net8.0/Avalonia.Base.dll
+
CP0002
F:Avalonia.Input.HoldingState.Cancelled
@@ -2599,12 +2743,72 @@
baseline/Avalonia/lib/net8.0/Avalonia.Base.dll
current/Avalonia/lib/net8.0/Avalonia.Base.dll
+
+ CP0002
+ M:Avalonia.Input.FocusManager.#ctor(Avalonia.Input.IInputElement)
+ baseline/Avalonia/lib/net8.0/Avalonia.Base.dll
+ current/Avalonia/lib/net8.0/Avalonia.Base.dll
+
+
+ CP0002
+ M:Avalonia.Input.FocusManager.ClearFocus
+ baseline/Avalonia/lib/net8.0/Avalonia.Base.dll
+ current/Avalonia/lib/net8.0/Avalonia.Base.dll
+
+
+ CP0002
+ M:Avalonia.Input.FocusManager.ClearFocusOnElementRemoved(Avalonia.Input.IInputElement,Avalonia.Visual)
+ baseline/Avalonia/lib/net8.0/Avalonia.Base.dll
+ current/Avalonia/lib/net8.0/Avalonia.Base.dll
+
+
+ CP0002
+ M:Avalonia.Input.FocusManager.FindNextElement(Avalonia.Input.NavigationDirection)
+ baseline/Avalonia/lib/net8.0/Avalonia.Base.dll
+ current/Avalonia/lib/net8.0/Avalonia.Base.dll
+
+
+ CP0002
+ M:Avalonia.Input.FocusManager.TryMoveFocus(Avalonia.Input.NavigationDirection)
+ baseline/Avalonia/lib/net8.0/Avalonia.Base.dll
+ current/Avalonia/lib/net8.0/Avalonia.Base.dll
+
+
+ CP0002
+ M:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.get_CrossAxisCancelThreshold
+ baseline/Avalonia/lib/net8.0/Avalonia.Base.dll
+ current/Avalonia/lib/net8.0/Avalonia.Base.dll
+
+
+ CP0002
+ M:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.get_EdgeSize
+ baseline/Avalonia/lib/net8.0/Avalonia.Base.dll
+ current/Avalonia/lib/net8.0/Avalonia.Base.dll
+
+
+ CP0002
+ M:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.set_CrossAxisCancelThreshold(System.Double)
+ baseline/Avalonia/lib/net8.0/Avalonia.Base.dll
+ current/Avalonia/lib/net8.0/Avalonia.Base.dll
+
+
+ CP0002
+ M:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.set_EdgeSize(System.Double)
+ baseline/Avalonia/lib/net8.0/Avalonia.Base.dll
+ current/Avalonia/lib/net8.0/Avalonia.Base.dll
+
CP0002
M:Avalonia.Input.HoldingRoutedEventArgs.#ctor(Avalonia.Input.HoldingState,Avalonia.Point,Avalonia.Input.PointerType)
baseline/Avalonia/lib/net8.0/Avalonia.Base.dll
current/Avalonia/lib/net8.0/Avalonia.Base.dll
+
+ CP0002
+ M:Avalonia.Input.IFocusManager.ClearFocus
+ baseline/Avalonia/lib/net8.0/Avalonia.Base.dll
+ current/Avalonia/lib/net8.0/Avalonia.Base.dll
+
CP0002
M:Avalonia.Input.IInputRoot.get_KeyboardNavigationHandler
@@ -2857,6 +3061,18 @@
baseline/Avalonia/lib/net8.0/Avalonia.Base.dll
current/Avalonia/lib/net8.0/Avalonia.Base.dll
+
+ CP0002
+ M:Avalonia.Input.SwipeGestureEventArgs.#ctor(System.Int32,Avalonia.Input.SwipeDirection,Avalonia.Vector,Avalonia.Point)
+ baseline/Avalonia/lib/net8.0/Avalonia.Base.dll
+ current/Avalonia/lib/net8.0/Avalonia.Base.dll
+
+
+ CP0002
+ M:Avalonia.Input.SwipeGestureEventArgs.get_StartPoint
+ baseline/Avalonia/lib/net8.0/Avalonia.Base.dll
+ current/Avalonia/lib/net8.0/Avalonia.Base.dll
+
CP0002
M:Avalonia.Input.TextInput.TextInputMethodClient.ShowInputPanel
@@ -3571,12 +3787,36 @@
baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll
current/Avalonia/lib/net8.0/Avalonia.Controls.dll
+
+ CP0002
+ M:Avalonia.Controls.Primitives.TextSearch.GetText(Avalonia.Interactivity.Interactive)
+ baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll
+ current/Avalonia/lib/net8.0/Avalonia.Controls.dll
+
+
+ CP0002
+ M:Avalonia.Controls.Primitives.TextSearch.GetTextBinding(Avalonia.Interactivity.Interactive)
+ baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll
+ current/Avalonia/lib/net8.0/Avalonia.Controls.dll
+
CP0002
M:Avalonia.Controls.Primitives.TextSearch.SetText(Avalonia.Controls.Control,System.String)
baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll
current/Avalonia/lib/net8.0/Avalonia.Controls.dll
+
+ CP0002
+ M:Avalonia.Controls.Primitives.TextSearch.SetText(Avalonia.Interactivity.Interactive,System.String)
+ baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll
+ current/Avalonia/lib/net8.0/Avalonia.Controls.dll
+
+
+ CP0002
+ M:Avalonia.Controls.Primitives.TextSearch.SetTextBinding(Avalonia.Interactivity.Interactive,Avalonia.Data.BindingBase)
+ baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll
+ current/Avalonia/lib/net8.0/Avalonia.Controls.dll
+
CP0002
M:Avalonia.Controls.Primitives.ToggleButton.add_Checked(System.EventHandler{Avalonia.Interactivity.RoutedEventArgs})
@@ -3643,6 +3883,12 @@
baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll
current/Avalonia/lib/net8.0/Avalonia.Controls.dll
+
+ CP0002
+ M:Avalonia.Controls.Primitives.VisualLayerManager.get_IsPopup
+ baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll
+ current/Avalonia/lib/net8.0/Avalonia.Controls.dll
+
CP0002
M:Avalonia.Controls.Primitives.VisualLayerManager.get_LightDismissOverlayLayer
@@ -3661,6 +3907,12 @@
baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll
current/Avalonia/lib/net8.0/Avalonia.Controls.dll
+
+ CP0002
+ M:Avalonia.Controls.Primitives.VisualLayerManager.set_IsPopup(System.Boolean)
+ baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll
+ current/Avalonia/lib/net8.0/Avalonia.Controls.dll
+
CP0002
M:Avalonia.Controls.Screens.ScreenFromWindow(Avalonia.Platform.IWindowBaseImpl)
@@ -4015,6 +4267,36 @@
baseline/Avalonia/lib/net10.0/Avalonia.Base.dll
current/Avalonia/lib/net10.0/Avalonia.Base.dll
+
+ CP0006
+ M:Avalonia.Input.IFocusManager.FindFirstFocusableElement
+ baseline/Avalonia/lib/net10.0/Avalonia.Base.dll
+ current/Avalonia/lib/net10.0/Avalonia.Base.dll
+
+
+ CP0006
+ M:Avalonia.Input.IFocusManager.FindLastFocusableElement
+ baseline/Avalonia/lib/net10.0/Avalonia.Base.dll
+ current/Avalonia/lib/net10.0/Avalonia.Base.dll
+
+
+ CP0006
+ M:Avalonia.Input.IFocusManager.FindNextElement(Avalonia.Input.NavigationDirection,Avalonia.Input.FindNextElementOptions)
+ baseline/Avalonia/lib/net10.0/Avalonia.Base.dll
+ current/Avalonia/lib/net10.0/Avalonia.Base.dll
+
+
+ CP0006
+ M:Avalonia.Input.IFocusManager.Focus(Avalonia.Input.IInputElement,Avalonia.Input.NavigationMethod,Avalonia.Input.KeyModifiers)
+ baseline/Avalonia/lib/net10.0/Avalonia.Base.dll
+ current/Avalonia/lib/net10.0/Avalonia.Base.dll
+
+
+ CP0006
+ M:Avalonia.Input.IFocusManager.TryMoveFocus(Avalonia.Input.NavigationDirection,Avalonia.Input.FindNextElementOptions)
+ baseline/Avalonia/lib/net10.0/Avalonia.Base.dll
+ current/Avalonia/lib/net10.0/Avalonia.Base.dll
+
CP0006
M:Avalonia.Input.IKeyboardNavigationHandler.Move(Avalonia.Input.IInputElement,Avalonia.Input.NavigationDirection,Avalonia.Input.KeyModifiers,System.Nullable{Avalonia.Input.KeyDeviceType})
@@ -4303,6 +4585,36 @@
baseline/Avalonia/lib/net8.0/Avalonia.Base.dll
current/Avalonia/lib/net8.0/Avalonia.Base.dll
+
+ CP0006
+ M:Avalonia.Input.IFocusManager.FindFirstFocusableElement
+ baseline/Avalonia/lib/net8.0/Avalonia.Base.dll
+ current/Avalonia/lib/net8.0/Avalonia.Base.dll
+
+
+ CP0006
+ M:Avalonia.Input.IFocusManager.FindLastFocusableElement
+ baseline/Avalonia/lib/net8.0/Avalonia.Base.dll
+ current/Avalonia/lib/net8.0/Avalonia.Base.dll
+
+
+ CP0006
+ M:Avalonia.Input.IFocusManager.FindNextElement(Avalonia.Input.NavigationDirection,Avalonia.Input.FindNextElementOptions)
+ baseline/Avalonia/lib/net8.0/Avalonia.Base.dll
+ current/Avalonia/lib/net8.0/Avalonia.Base.dll
+
+
+ CP0006
+ M:Avalonia.Input.IFocusManager.Focus(Avalonia.Input.IInputElement,Avalonia.Input.NavigationMethod,Avalonia.Input.KeyModifiers)
+ baseline/Avalonia/lib/net8.0/Avalonia.Base.dll
+ current/Avalonia/lib/net8.0/Avalonia.Base.dll
+
+
+ CP0006
+ M:Avalonia.Input.IFocusManager.TryMoveFocus(Avalonia.Input.NavigationDirection,Avalonia.Input.FindNextElementOptions)
+ baseline/Avalonia/lib/net8.0/Avalonia.Base.dll
+ current/Avalonia/lib/net8.0/Avalonia.Base.dll
+
CP0006
M:Avalonia.Input.IKeyboardNavigationHandler.Move(Avalonia.Input.IInputElement,Avalonia.Input.NavigationDirection,Avalonia.Input.KeyModifiers,System.Nullable{Avalonia.Input.KeyDeviceType})
diff --git a/global.json b/global.json
index 3773c7d736..f6ed3dfdfb 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"sdk": {
- "version": "10.0.101",
+ "version": "10.0.201",
"rollForward": "latestFeature"
},
"test": {
diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index b6249fe17f..2a0de7a114 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -54,8 +54,10 @@
ScrollViewer.VerticalScrollBarVisibility="Disabled">
-
-
+
+
diff --git a/samples/ControlCatalog/Pages/CarouselDemoPage.xaml b/samples/ControlCatalog/Pages/CarouselDemoPage.xaml
new file mode 100644
index 0000000000..df4317fcad
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselDemoPage.xaml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
diff --git a/samples/ControlCatalog/Pages/CarouselDemoPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselDemoPage.xaml.cs
new file mode 100644
index 0000000000..64753b9fc4
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselDemoPage.xaml.cs
@@ -0,0 +1,53 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+
+namespace ControlCatalog.Pages
+{
+ public partial class CarouselDemoPage : UserControl
+ {
+ private static readonly (string Group, string Title, string Description, Func Factory)[] Demos =
+ {
+ // Overview
+ ("Overview", "Getting Started",
+ "Basic Carousel with image items and previous/next navigation buttons.",
+ () => new CarouselGettingStartedPage()),
+
+ // Features
+ ("Features", "Transitions",
+ "Configure page transitions: PageSlide, CrossFade, 3D Rotation, or None.",
+ () => new CarouselTransitionsPage()),
+ ("Features", "Customization",
+ "Adjust orientation and transition type to tailor the carousel layout.",
+ () => new CarouselCustomizationPage()),
+ ("Features", "Gestures & Keyboard",
+ "Navigate items via swipe gesture and arrow keys. Toggle each input mode on and off.",
+ () => new CarouselGesturesPage()),
+ ("Features", "Vertical Orientation",
+ "Carousel with Orientation set to Vertical, navigated with Up/Down keys, swipe, or buttons.",
+ () => new CarouselVerticalPage()),
+ ("Features", "Multi-Item Peek",
+ "Adjust ViewportFraction to show multiple items simultaneously with adjacent cards peeking.",
+ () => new CarouselMultiItemPage()),
+ ("Features", "Data Binding",
+ "Bind Carousel to an ObservableCollection and add, remove, or shuffle items at runtime.",
+ () => new CarouselDataBindingPage()),
+
+ // Showcases
+ ("Showcases", "Curated Gallery",
+ "Editorial art gallery app with DrawerPage navigation, hero Carousel with PipsPager dots, and a horizontal peek carousel for collection highlights.",
+ () => new CarouselGalleryAppPage()),
+ };
+
+ public CarouselDemoPage()
+ {
+ InitializeComponent();
+ Loaded += OnLoaded;
+ }
+
+ private async void OnLoaded(object? sender, RoutedEventArgs e)
+ {
+ await SampleNav.PushAsync(NavigationDemoHelper.CreateGalleryHomePage(SampleNav, Demos), null);
+ }
+ }
+}
diff --git a/samples/ControlCatalog/Pages/CarouselPage.xaml b/samples/ControlCatalog/Pages/CarouselPage.xaml
index 352fa32e30..c6e20fec5b 100644
--- a/samples/ControlCatalog/Pages/CarouselPage.xaml
+++ b/samples/ControlCatalog/Pages/CarouselPage.xaml
@@ -1,44 +1,117 @@
-
- An items control that displays its items as pages that fill the control.
+
+ A swipeable items control that can reveal adjacent pages with ViewportFraction.
-
-
-
- Transition
-
+
+
+
+ Transition
+
None
- Slide
- Crossfade
- 3D Rotation
+ Page Slide
+ Cross Fade
+ Rotate 3D
+ Card Stack
+ Wave Reveal
+ Composite (Slide + Fade)
-
-
- Orientation
-
+ Orientation
+
Horizontal
Vertical
+
+ Viewport Fraction
+
+
+
+ 1.00
+
+
+
+
+
+
+
+
+ Wrap Selection
+ Swipe Enabled
+
+
+
+
+
+
+
+ Total Items:
+ 0
+
+
+ Selected Index:
+ 0
+
+
diff --git a/samples/ControlCatalog/Pages/CarouselPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage.xaml.cs
index 713da34051..0a0c973b90 100644
--- a/samples/ControlCatalog/Pages/CarouselPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/CarouselPage.xaml.cs
@@ -1,6 +1,9 @@
using System;
+using Avalonia;
using Avalonia.Animation;
using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using ControlCatalog.Pages.Transitions;
namespace ControlCatalog.Pages
{
@@ -9,28 +12,137 @@ namespace ControlCatalog.Pages
public CarouselPage()
{
InitializeComponent();
+
left.Click += (s, e) => carousel.Previous();
right.Click += (s, e) => carousel.Next();
transition.SelectionChanged += TransitionChanged;
orientation.SelectionChanged += TransitionChanged;
+ viewportFraction.ValueChanged += ViewportFractionChanged;
+
+ wrapSelection.IsChecked = carousel.WrapSelection;
+ wrapSelection.IsCheckedChanged += (s, e) =>
+ {
+ carousel.WrapSelection = wrapSelection.IsChecked ?? false;
+ UpdateButtonState();
+ };
+
+ swipeEnabled.IsChecked = carousel.IsSwipeEnabled;
+ swipeEnabled.IsCheckedChanged += (s, e) =>
+ {
+ carousel.IsSwipeEnabled = swipeEnabled.IsChecked ?? false;
+ };
+
+ carousel.PropertyChanged += (s, e) =>
+ {
+ if (e.Property == SelectingItemsControl.SelectedIndexProperty)
+ {
+ UpdateButtonState();
+ }
+ else if (e.Property == Carousel.ViewportFractionProperty)
+ {
+ UpdateViewportFractionDisplay();
+ }
+ };
+
+ carousel.ViewportFraction = viewportFraction.Value;
+ UpdateButtonState();
+ UpdateViewportFractionDisplay();
+ }
+
+ private void UpdateButtonState()
+ {
+ itemsCountIndicator.Text = carousel.ItemCount.ToString();
+ selectedIndexIndicator.Text = carousel.SelectedIndex.ToString();
+
+ var wrap = carousel.WrapSelection;
+ left.IsEnabled = wrap || carousel.SelectedIndex > 0;
+ right.IsEnabled = wrap || carousel.SelectedIndex < carousel.ItemCount - 1;
+ }
+
+ private void ViewportFractionChanged(object? sender, RangeBaseValueChangedEventArgs e)
+ {
+ carousel.ViewportFraction = Math.Round(e.NewValue, 2);
+ UpdateViewportFractionDisplay();
+ }
+
+ private void UpdateViewportFractionDisplay()
+ {
+ var value = carousel.ViewportFraction;
+ viewportFractionIndicator.Text = value.ToString("0.00");
+
+ var pagesInView = 1d / value;
+ viewportFractionHint.Text = value >= 1d
+ ? "1.00 shows a single full page."
+ : $"{pagesInView:0.##} pages fit in view. Try 0.80 for peeking or 0.33 for three full items.";
}
private void TransitionChanged(object? sender, SelectionChangedEventArgs e)
{
+ var isVertical = orientation.SelectedIndex == 1;
+ var axis = isVertical ? PageSlide.SlideAxis.Vertical : PageSlide.SlideAxis.Horizontal;
+
switch (transition.SelectedIndex)
{
case 0:
carousel.PageTransition = null;
break;
case 1:
- carousel.PageTransition = new PageSlide(TimeSpan.FromSeconds(0.25), orientation.SelectedIndex == 0 ? PageSlide.SlideAxis.Horizontal : PageSlide.SlideAxis.Vertical);
+ carousel.PageTransition = new PageSlide(TimeSpan.FromSeconds(0.25), axis);
break;
case 2:
carousel.PageTransition = new CrossFade(TimeSpan.FromSeconds(0.25));
break;
case 3:
- carousel.PageTransition = new Rotate3DTransition(TimeSpan.FromSeconds(0.5), orientation.SelectedIndex == 0 ? PageSlide.SlideAxis.Horizontal : PageSlide.SlideAxis.Vertical);
+ carousel.PageTransition = new Rotate3DTransition(TimeSpan.FromSeconds(0.5), axis);
+ break;
+ case 4:
+ carousel.PageTransition = new CardStackPageTransition(TimeSpan.FromSeconds(0.5), axis);
+ break;
+ case 5:
+ carousel.PageTransition = new WaveRevealPageTransition(TimeSpan.FromSeconds(0.8), axis);
break;
+ case 6:
+ carousel.PageTransition = new CompositePageTransition
+ {
+ PageTransitions =
+ {
+ new PageSlide(TimeSpan.FromSeconds(0.25), axis),
+ new CrossFade(TimeSpan.FromSeconds(0.25)),
+ }
+ };
+ break;
+ }
+
+ UpdateLayoutForOrientation(isVertical);
+ }
+
+ private void UpdateLayoutForOrientation(bool isVertical)
+ {
+ if (isVertical)
+ {
+ Grid.SetColumn(left, 1);
+ Grid.SetRow(left, 0);
+ Grid.SetColumn(right, 1);
+ Grid.SetRow(right, 2);
+
+ left.Padding = new Thickness(20, 10);
+ right.Padding = new Thickness(20, 10);
+
+ leftArrow.RenderTransform = new Avalonia.Media.RotateTransform(90);
+ rightArrow.RenderTransform = new Avalonia.Media.RotateTransform(90);
+ }
+ else
+ {
+ Grid.SetColumn(left, 0);
+ Grid.SetRow(left, 1);
+ Grid.SetColumn(right, 2);
+ Grid.SetRow(right, 1);
+
+ left.Padding = new Thickness(10, 20);
+ right.Padding = new Thickness(10, 20);
+
+ leftArrow.RenderTransform = null;
+ rightArrow.RenderTransform = null;
}
}
}
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselCustomizationPage.xaml b/samples/ControlCatalog/Pages/CarouselPage/CarouselCustomizationPage.xaml
new file mode 100644
index 0000000000..add442e7a1
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselCustomizationPage.xaml
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Horizontal
+ Vertical
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselCustomizationPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage/CarouselCustomizationPage.xaml.cs
new file mode 100644
index 0000000000..c3b919d65d
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselCustomizationPage.xaml.cs
@@ -0,0 +1,48 @@
+using System;
+using Avalonia.Animation;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Interactivity;
+
+namespace ControlCatalog.Pages
+{
+ public partial class CarouselCustomizationPage : UserControl
+ {
+ public CarouselCustomizationPage()
+ {
+ InitializeComponent();
+ PreviousButton.Click += (_, _) => DemoCarousel.Previous();
+ NextButton.Click += (_, _) => DemoCarousel.Next();
+ OrientationCombo.SelectionChanged += (_, _) => ApplyOrientation();
+ ViewportSlider.ValueChanged += OnViewportFractionChanged;
+ }
+
+ private void ApplyOrientation()
+ {
+ var horizontal = OrientationCombo.SelectedIndex == 0;
+ var axis = horizontal ? PageSlide.SlideAxis.Horizontal : PageSlide.SlideAxis.Vertical;
+ DemoCarousel.PageTransition = new PageSlide(TimeSpan.FromSeconds(0.25), axis);
+ StatusText.Text = $"Orientation: {(horizontal ? "Horizontal" : "Vertical")}";
+ }
+
+ private void OnViewportFractionChanged(object? sender, RangeBaseValueChangedEventArgs e)
+ {
+ var value = Math.Round(e.NewValue, 2);
+ DemoCarousel.ViewportFraction = value;
+ ViewportLabel.Text = value.ToString("0.00");
+ ViewportHint.Text = value >= 1d ?
+ "1.00 shows a single full page." :
+ $"{1d / value:0.##} pages fit in view. Try 0.80 for peeking.";
+ }
+
+ private void OnWrapSelectionChanged(object? sender, RoutedEventArgs e)
+ {
+ DemoCarousel.WrapSelection = WrapSelectionCheck.IsChecked == true;
+ }
+
+ private void OnSwipeEnabledChanged(object? sender, RoutedEventArgs e)
+ {
+ DemoCarousel.IsSwipeEnabled = SwipeEnabledCheck.IsChecked == true;
+ }
+ }
+}
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselDataBindingPage.xaml b/samples/ControlCatalog/Pages/CarouselPage/CarouselDataBindingPage.xaml
new file mode 100644
index 0000000000..fcb7e96f52
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselDataBindingPage.xaml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselDataBindingPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage/CarouselDataBindingPage.xaml.cs
new file mode 100644
index 0000000000..5a7b6e46da
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselDataBindingPage.xaml.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Media;
+
+namespace ControlCatalog.Pages
+{
+ public class CarouselCardItem
+ {
+ public string Number { get; set; } = "";
+ public string Title { get; set; } = "";
+ public IBrush Background { get; set; } = Brushes.Gray;
+ public IBrush Accent { get; set; } = Brushes.White;
+ }
+
+ public partial class CarouselDataBindingPage : UserControl
+ {
+ private static readonly (string Title, string Color, string Accent)[] Palette =
+ {
+ ("Neon Pulse", "#3525CD", "#C3C0FF"), ("Ephemeral Blue", "#0891B2", "#BAF0FA"),
+ ("Forest Forms", "#059669", "#A7F3D0"), ("Golden Hour", "#D97706", "#FDE68A"),
+ ("Crimson Wave", "#BE185D", "#FBCFE8"), ("Stone Age", "#57534E", "#D6D3D1"),
+ };
+
+ private readonly ObservableCollection _items = new();
+ private int _addCounter;
+
+ public CarouselDataBindingPage()
+ {
+ InitializeComponent();
+ DemoCarousel.ItemsSource = _items;
+ DemoCarousel.SelectionChanged += OnSelectionChanged;
+
+ for (var i = 0; i < 4; i++)
+ AppendItem();
+
+ PreviousButton.Click += (_, _) => DemoCarousel.Previous();
+ NextButton.Click += (_, _) => DemoCarousel.Next();
+ AddButton.Click += OnAddItem;
+ RemoveButton.Click += OnRemoveCurrent;
+ ShuffleButton.Click += OnShuffle;
+ UpdateStatus();
+ }
+
+ private void AppendItem()
+ {
+ var (title, color, accent) = Palette[_addCounter % Palette.Length];
+ _items.Add(new CarouselCardItem
+ {
+ Number = $"{_items.Count + 1:D2}",
+ Title = title,
+ Background = new SolidColorBrush(Color.Parse(color)),
+ Accent = new SolidColorBrush(Color.Parse(accent)),
+ });
+ _addCounter++;
+ }
+
+ private void OnAddItem(object? sender, RoutedEventArgs e)
+ {
+ AppendItem();
+ UpdateStatus();
+ }
+
+ private void OnRemoveCurrent(object? sender, RoutedEventArgs e)
+ {
+ if (_items.Count == 0)
+ return;
+ var idx = Math.Clamp(DemoCarousel.SelectedIndex, 0, _items.Count - 1);
+ _items.RemoveAt(idx);
+ UpdateStatus();
+ }
+
+ private void OnShuffle(object? sender, RoutedEventArgs e)
+ {
+ var rng = new Random();
+ var shuffled = _items.OrderBy(_ => rng.Next()).ToList();
+ _items.Clear();
+ foreach (var item in shuffled)
+ _items.Add(item);
+ UpdateStatus();
+ }
+
+ private void OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
+ {
+ UpdateStatus();
+ }
+
+ private void UpdateStatus()
+ {
+ StatusText.Text = $"Item: {DemoCarousel.SelectedIndex + 1} / {_items.Count}";
+ }
+ }
+}
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselGalleryAppPage.xaml b/samples/ControlCatalog/Pages/CarouselPage/CarouselGalleryAppPage.xaml
new file mode 100644
index 0000000000..9c7c8e0eab
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselGalleryAppPage.xaml
@@ -0,0 +1,557 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselGalleryAppPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage/CarouselGalleryAppPage.xaml.cs
new file mode 100644
index 0000000000..5c637b5454
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselGalleryAppPage.xaml.cs
@@ -0,0 +1,101 @@
+using System;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+
+namespace ControlCatalog.Pages
+{
+ public partial class CarouselGalleryAppPage : UserControl
+ {
+ private bool _syncing;
+ private Point _dragStart;
+ private bool _isDragging;
+ private const double SwipeThreshold = 50;
+
+ private ScrollViewer? _infoPanel;
+
+ public CarouselGalleryAppPage()
+ {
+ InitializeComponent();
+ _infoPanel = this.FindControl("InfoPanel");
+ HeroCarousel.SelectionChanged += OnHeroSelectionChanged;
+ HeroPager.SelectedIndexChanged += OnPagerIndexChanged;
+ }
+
+ protected override void OnLoaded(RoutedEventArgs e)
+ {
+ base.OnLoaded(e);
+ UpdateInfoPanelVisibility();
+ }
+
+ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+ {
+ base.OnPropertyChanged(change);
+ if (change.Property == BoundsProperty)
+ UpdateInfoPanelVisibility();
+ }
+
+ private void UpdateInfoPanelVisibility()
+ {
+ if (_infoPanel != null)
+ _infoPanel.IsVisible = Bounds.Width >= 640;
+ }
+
+ private void OnHamburgerClick(object? sender, RoutedEventArgs e)
+ {
+ RootDrawer.IsOpen = !RootDrawer.IsOpen;
+ }
+
+ private void OnHeroSelectionChanged(object? sender, SelectionChangedEventArgs e)
+ {
+ if (_syncing)
+ return;
+ _syncing = true;
+ HeroPager.SelectedPageIndex = HeroCarousel.SelectedIndex;
+ _syncing = false;
+ }
+
+ private void OnPagerIndexChanged(object? sender, PipsPagerSelectedIndexChangedEventArgs e)
+ {
+ if (_syncing)
+ return;
+ _syncing = true;
+ HeroCarousel.SelectedIndex = e.NewIndex;
+ _syncing = false;
+ }
+
+ private void OnDrawerMenuSelectionChanged(object? sender, SelectionChangedEventArgs e)
+ {
+ RootDrawer.IsOpen = false;
+ DrawerMenu.SelectedItem = null;
+ }
+
+ private void OnHeroPointerPressed(object? sender, PointerPressedEventArgs e)
+ {
+ if (!e.GetCurrentPoint(null).Properties.IsLeftButtonPressed)
+ return;
+ _dragStart = e.GetPosition((Visual?)sender);
+ _isDragging = true;
+ }
+
+ private void OnHeroPointerReleased(object? sender, PointerReleasedEventArgs e)
+ {
+ if (!_isDragging)
+ return;
+ _isDragging = false;
+ var delta = e.GetPosition((Visual?)sender).X - _dragStart.X;
+ if (Math.Abs(delta) < SwipeThreshold)
+ return;
+ if (delta < 0)
+ HeroCarousel.Next();
+ else
+ HeroCarousel.Previous();
+ }
+
+ private void OnHeroPointerCaptureLost(object? sender, PointerCaptureLostEventArgs e)
+ {
+ _isDragging = false;
+ }
+ }
+}
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselGesturesPage.xaml b/samples/ControlCatalog/Pages/CarouselPage/CarouselGesturesPage.xaml
new file mode 100644
index 0000000000..7786168d4a
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselGesturesPage.xaml
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselGesturesPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage/CarouselGesturesPage.xaml.cs
new file mode 100644
index 0000000000..097dd54966
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselGesturesPage.xaml.cs
@@ -0,0 +1,59 @@
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+
+namespace ControlCatalog.Pages
+{
+ public partial class CarouselGesturesPage : UserControl
+ {
+ private bool _keyboardEnabled = true;
+
+ public CarouselGesturesPage()
+ {
+ InitializeComponent();
+ DemoCarousel.AddHandler(InputElement.KeyDownEvent, OnKeyDown, handledEventsToo: true);
+ DemoCarousel.SelectionChanged += OnSelectionChanged;
+ DemoCarousel.Loaded += (_, _) => DemoCarousel.Focus();
+ }
+
+ private void OnKeyDown(object? sender, KeyEventArgs e)
+ {
+ if (!_keyboardEnabled)
+ return;
+
+ switch (e.Key)
+ {
+ case Key.Left:
+ case Key.Up:
+ LastActionText.Text = $"Action: Key {e.Key} (Previous)";
+ break;
+ case Key.Right:
+ case Key.Down:
+ LastActionText.Text = $"Action: Key {e.Key} (Next)";
+ break;
+ }
+ }
+
+ private void OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
+ {
+ StatusText.Text = $"Item: {DemoCarousel.SelectedIndex + 1} / {DemoCarousel.ItemCount}";
+ if (DemoCarousel.IsSwiping)
+ LastActionText.Text = "Action: Swipe";
+ }
+
+ private void OnSwipeEnabledChanged(object? sender, RoutedEventArgs e)
+ {
+ DemoCarousel.IsSwipeEnabled = SwipeCheck.IsChecked == true;
+ }
+
+ private void OnWrapSelectionChanged(object? sender, RoutedEventArgs e)
+ {
+ DemoCarousel.WrapSelection = WrapCheck.IsChecked == true;
+ }
+
+ private void OnKeyboardEnabledChanged(object? sender, RoutedEventArgs e)
+ {
+ _keyboardEnabled = KeyboardCheck.IsChecked == true;
+ }
+ }
+}
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselGettingStartedPage.xaml b/samples/ControlCatalog/Pages/CarouselPage/CarouselGettingStartedPage.xaml
new file mode 100644
index 0000000000..680a65f204
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselGettingStartedPage.xaml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselGettingStartedPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage/CarouselGettingStartedPage.xaml.cs
new file mode 100644
index 0000000000..61aad36df3
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselGettingStartedPage.xaml.cs
@@ -0,0 +1,40 @@
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+
+namespace ControlCatalog.Pages
+{
+ public partial class CarouselGettingStartedPage : UserControl
+ {
+ public CarouselGettingStartedPage()
+ {
+ InitializeComponent();
+ PreviousButton.Click += OnPrevious;
+ NextButton.Click += OnNext;
+ DemoCarousel.SelectionChanged += OnSelectionChanged;
+ }
+
+ private void OnPrevious(object? sender, RoutedEventArgs e)
+ {
+ DemoCarousel.Previous();
+ UpdateStatus();
+ }
+
+ private void OnNext(object? sender, RoutedEventArgs e)
+ {
+ DemoCarousel.Next();
+ UpdateStatus();
+ }
+
+ private void OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
+ {
+ UpdateStatus();
+ }
+
+ private void UpdateStatus()
+ {
+ var index = DemoCarousel.SelectedIndex + 1;
+ var count = DemoCarousel.ItemCount;
+ StatusText.Text = $"Item: {index} / {count}";
+ }
+ }
+}
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselMultiItemPage.xaml b/samples/ControlCatalog/Pages/CarouselPage/CarouselMultiItemPage.xaml
new file mode 100644
index 0000000000..23e60f35f2
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselMultiItemPage.xaml
@@ -0,0 +1,140 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselMultiItemPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage/CarouselMultiItemPage.xaml.cs
new file mode 100644
index 0000000000..13182e7654
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselMultiItemPage.xaml.cs
@@ -0,0 +1,47 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Interactivity;
+
+namespace ControlCatalog.Pages
+{
+ public partial class CarouselMultiItemPage : UserControl
+ {
+ public CarouselMultiItemPage()
+ {
+ InitializeComponent();
+ PreviousButton.Click += (_, _) => DemoCarousel.Previous();
+ NextButton.Click += (_, _) => DemoCarousel.Next();
+ DemoCarousel.SelectionChanged += OnSelectionChanged;
+ }
+
+ private void OnViewportFractionChanged(object? sender, RangeBaseValueChangedEventArgs e)
+ {
+ if (DemoCarousel is null)
+ return;
+ var value = Math.Round(e.NewValue, 2);
+ DemoCarousel.ViewportFraction = value;
+ ViewportLabel.Text = value.ToString("0.00");
+ ViewportHint.Text = value >= 1d ? "1.00 — single full item." : $"~{1d / value:0.#} items visible.";
+ }
+
+ private void OnWrapChanged(object? sender, RoutedEventArgs e)
+ {
+ if (DemoCarousel is null)
+ return;
+ DemoCarousel.WrapSelection = WrapCheck.IsChecked == true;
+ }
+
+ private void OnSwipeChanged(object? sender, RoutedEventArgs e)
+ {
+ if (DemoCarousel is null)
+ return;
+ DemoCarousel.IsSwipeEnabled = SwipeCheck.IsChecked == true;
+ }
+
+ private void OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
+ {
+ StatusText.Text = $"Item: {DemoCarousel.SelectedIndex + 1} / {DemoCarousel.ItemCount}";
+ }
+ }
+}
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselTransitionsPage.xaml b/samples/ControlCatalog/Pages/CarouselPage/CarouselTransitionsPage.xaml
new file mode 100644
index 0000000000..b04ea78ed2
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselTransitionsPage.xaml
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ None
+ Page Slide
+ Cross Fade
+ Rotate 3D
+ Card Stack
+ Wave Reveal
+ Composite (Slide + Fade)
+
+
+
+
+ Horizontal
+ Vertical
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselTransitionsPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage/CarouselTransitionsPage.xaml.cs
new file mode 100644
index 0000000000..2d69ecd4af
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselTransitionsPage.xaml.cs
@@ -0,0 +1,66 @@
+using System;
+using Avalonia.Animation;
+using Avalonia.Controls;
+using ControlCatalog.Pages.Transitions;
+
+namespace ControlCatalog.Pages
+{
+ public partial class CarouselTransitionsPage : UserControl
+ {
+ public CarouselTransitionsPage()
+ {
+ InitializeComponent();
+ PreviousButton.Click += (_, _) => DemoCarousel.Previous();
+ NextButton.Click += (_, _) => DemoCarousel.Next();
+ TransitionCombo.SelectionChanged += (_, _) => ApplyTransition();
+ OrientationCombo.SelectionChanged += (_, _) => ApplyTransition();
+ }
+
+ private void ApplyTransition()
+ {
+ var axis = OrientationCombo.SelectedIndex == 0 ?
+ PageSlide.SlideAxis.Horizontal :
+ PageSlide.SlideAxis.Vertical;
+ var label = axis == PageSlide.SlideAxis.Horizontal ? "Horizontal" : "Vertical";
+
+ switch (TransitionCombo.SelectedIndex)
+ {
+ case 0:
+ DemoCarousel.PageTransition = null;
+ StatusText.Text = "Transition: None";
+ break;
+ case 1:
+ DemoCarousel.PageTransition = new PageSlide(TimeSpan.FromSeconds(0.25), axis);
+ StatusText.Text = $"Transition: Page Slide ({label})";
+ break;
+ case 2:
+ DemoCarousel.PageTransition = new CrossFade(TimeSpan.FromSeconds(0.25));
+ StatusText.Text = "Transition: Cross Fade";
+ break;
+ case 3:
+ DemoCarousel.PageTransition = new Rotate3DTransition(TimeSpan.FromSeconds(0.5), axis);
+ StatusText.Text = $"Transition: Rotate 3D ({label})";
+ break;
+ case 4:
+ DemoCarousel.PageTransition = new CardStackPageTransition(TimeSpan.FromSeconds(0.5), axis);
+ StatusText.Text = $"Transition: Card Stack ({label})";
+ break;
+ case 5:
+ DemoCarousel.PageTransition = new WaveRevealPageTransition(TimeSpan.FromSeconds(0.8), axis);
+ StatusText.Text = $"Transition: Wave Reveal ({label})";
+ break;
+ case 6:
+ DemoCarousel.PageTransition = new CompositePageTransition
+ {
+ PageTransitions =
+ {
+ new PageSlide(TimeSpan.FromSeconds(0.25), axis),
+ new CrossFade(TimeSpan.FromSeconds(0.25)),
+ }
+ };
+ StatusText.Text = "Transition: Composite (Slide + Fade)";
+ break;
+ }
+ }
+ }
+}
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselVerticalPage.xaml b/samples/ControlCatalog/Pages/CarouselPage/CarouselVerticalPage.xaml
new file mode 100644
index 0000000000..f916e4f526
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselVerticalPage.xaml
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PageSlide
+ CrossFade
+ None
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselVerticalPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage/CarouselVerticalPage.xaml.cs
new file mode 100644
index 0000000000..ac964047c0
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselVerticalPage.xaml.cs
@@ -0,0 +1,39 @@
+using Avalonia.Animation;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+
+namespace ControlCatalog.Pages
+{
+ public partial class CarouselVerticalPage : UserControl
+ {
+ public CarouselVerticalPage()
+ {
+ InitializeComponent();
+ PreviousButton.Click += (_, _) => DemoCarousel.Previous();
+ NextButton.Click += (_, _) => DemoCarousel.Next();
+ DemoCarousel.SelectionChanged += OnSelectionChanged;
+ TransitionCombo.SelectionChanged += OnTransitionChanged;
+ DemoCarousel.Loaded += (_, _) => DemoCarousel.Focus();
+ }
+
+ private void OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
+ {
+ StatusText.Text = $"Item: {DemoCarousel.SelectedIndex + 1} / {DemoCarousel.ItemCount}";
+ }
+
+ private void OnTransitionChanged(object? sender, SelectionChangedEventArgs e)
+ {
+ DemoCarousel.PageTransition = TransitionCombo.SelectedIndex switch
+ {
+ 1 => new CrossFade(System.TimeSpan.FromSeconds(0.3)),
+ 2 => null,
+ _ => new PageSlide(System.TimeSpan.FromSeconds(0.3), PageSlide.SlideAxis.Vertical),
+ };
+ }
+
+ private void OnWrapSelectionChanged(object? sender, RoutedEventArgs e)
+ {
+ DemoCarousel.WrapSelection = WrapCheck.IsChecked == true;
+ }
+ }
+}
diff --git a/samples/ControlCatalog/Pages/DrawerPage/DrawerPageCustomizationPage.xaml.cs b/samples/ControlCatalog/Pages/DrawerPage/DrawerPageCustomizationPage.xaml.cs
index 697e67f0f4..243bc5868b 100644
--- a/samples/ControlCatalog/Pages/DrawerPage/DrawerPageCustomizationPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DrawerPage/DrawerPageCustomizationPage.xaml.cs
@@ -1,5 +1,7 @@
+using System.Linq;
using Avalonia.Controls;
using Avalonia.Controls.Primitives;
+using Avalonia.Input.GestureRecognizers;
using Avalonia.Interactivity;
using Avalonia.Media;
@@ -22,6 +24,7 @@ namespace ControlCatalog.Pages
public DrawerPageCustomizationPage()
{
InitializeComponent();
+ EnableMouseSwipeGesture(DemoDrawer);
}
protected override void OnLoaded(RoutedEventArgs e)
@@ -188,5 +191,15 @@ namespace ControlCatalog.Pages
if (DemoDrawer.DrawerBehavior != DrawerBehavior.Locked)
DemoDrawer.IsOpen = false;
}
+
+ private static void EnableMouseSwipeGesture(Control control)
+ {
+ var recognizer = control.GestureRecognizers
+ .OfType()
+ .FirstOrDefault();
+
+ if (recognizer is not null)
+ recognizer.IsMouseEnabled = true;
+ }
}
}
diff --git a/samples/ControlCatalog/Pages/DrawerPage/DrawerPageFirstLookPage.xaml.cs b/samples/ControlCatalog/Pages/DrawerPage/DrawerPageFirstLookPage.xaml.cs
index 58a981f640..de72957d73 100644
--- a/samples/ControlCatalog/Pages/DrawerPage/DrawerPageFirstLookPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DrawerPage/DrawerPageFirstLookPage.xaml.cs
@@ -1,4 +1,6 @@
+using System.Linq;
using Avalonia.Controls;
+using Avalonia.Input.GestureRecognizers;
using Avalonia.Interactivity;
namespace ControlCatalog.Pages
@@ -8,6 +10,7 @@ namespace ControlCatalog.Pages
public DrawerPageFirstLookPage()
{
InitializeComponent();
+ EnableMouseSwipeGesture(DemoDrawer);
}
protected override void OnLoaded(RoutedEventArgs e)
@@ -61,5 +64,15 @@ namespace ControlCatalog.Pages
{
StatusText.Text = $"Drawer: {(DemoDrawer.IsOpen ? "Open" : "Closed")}";
}
+
+ private static void EnableMouseSwipeGesture(Control control)
+ {
+ var recognizer = control.GestureRecognizers
+ .OfType()
+ .FirstOrDefault();
+
+ if (recognizer is not null)
+ recognizer.IsMouseEnabled = true;
+ }
}
}
diff --git a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageGesturePage.xaml.cs b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageGesturePage.xaml.cs
index ff711f3a63..c18cfebc7e 100644
--- a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageGesturePage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageGesturePage.xaml.cs
@@ -1,4 +1,6 @@
+using System.Linq;
using Avalonia.Controls;
+using Avalonia.Input.GestureRecognizers;
using Avalonia.Interactivity;
namespace ControlCatalog.Pages
@@ -8,6 +10,7 @@ namespace ControlCatalog.Pages
public NavigationPageGesturePage()
{
InitializeComponent();
+ EnableMouseSwipeGesture(DemoNav);
Loaded += OnLoaded;
}
@@ -43,5 +46,15 @@ namespace ControlCatalog.Pages
{
StatusText.Text = $"Depth: {DemoNav.StackDepth}";
}
+
+ private static void EnableMouseSwipeGesture(Control control)
+ {
+ var recognizer = control.GestureRecognizers
+ .OfType()
+ .FirstOrDefault();
+
+ if (recognizer is not null)
+ recognizer.IsMouseEnabled = true;
+ }
}
}
diff --git a/samples/ControlCatalog/Pages/TabbedPage/TabbedPageGesturePage.xaml.cs b/samples/ControlCatalog/Pages/TabbedPage/TabbedPageGesturePage.xaml.cs
index bee2c43efd..e17ebc5ed8 100644
--- a/samples/ControlCatalog/Pages/TabbedPage/TabbedPageGesturePage.xaml.cs
+++ b/samples/ControlCatalog/Pages/TabbedPage/TabbedPageGesturePage.xaml.cs
@@ -1,4 +1,6 @@
+using System.Linq;
using Avalonia.Controls;
+using Avalonia.Input.GestureRecognizers;
namespace ControlCatalog.Pages
{
@@ -7,6 +9,7 @@ namespace ControlCatalog.Pages
public TabbedPageGesturePage()
{
InitializeComponent();
+ EnableMouseSwipeGesture(DemoTabs);
}
private void OnGestureEnabledChanged(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
@@ -26,5 +29,15 @@ namespace ControlCatalog.Pages
_ => TabPlacement.Top
};
}
+
+ private static void EnableMouseSwipeGesture(Control control)
+ {
+ var recognizer = control.GestureRecognizers
+ .OfType()
+ .FirstOrDefault();
+
+ if (recognizer is not null)
+ recognizer.IsMouseEnabled = true;
+ }
}
}
diff --git a/samples/ControlCatalog/Pages/Transitions/CardStackPageTransition.cs b/samples/ControlCatalog/Pages/Transitions/CardStackPageTransition.cs
new file mode 100644
index 0000000000..89ae1e5e8a
--- /dev/null
+++ b/samples/ControlCatalog/Pages/Transitions/CardStackPageTransition.cs
@@ -0,0 +1,447 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Avalonia;
+using Avalonia.Animation;
+using Avalonia.Animation.Easings;
+using Avalonia.Media;
+using Avalonia.Styling;
+
+namespace ControlCatalog.Pages.Transitions;
+
+///
+/// Transitions between two pages with a card-stack effect:
+/// the top page moves/rotates away while the next page scales up underneath.
+///
+public class CardStackPageTransition : PageSlide
+{
+ private const double ViewportLiftScale = 0.03;
+ private const double ViewportPromotionScale = 0.02;
+ private const double ViewportDepthOpacityFalloff = 0.08;
+ private const double SidePeekAngle = 4.0;
+ private const double FarPeekAngle = 7.0;
+
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ public CardStackPageTransition()
+ {
+ }
+
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ /// The duration of the animation.
+ /// The axis on which the animation should occur.
+ public CardStackPageTransition(TimeSpan duration, PageSlide.SlideAxis orientation = PageSlide.SlideAxis.Horizontal)
+ : base(duration, orientation)
+ {
+ }
+
+ ///
+ /// Gets or sets the maximum rotation angle (degrees) applied to the top card.
+ ///
+ public double MaxSwipeAngle { get; set; } = 15.0;
+
+ ///
+ /// Gets or sets the scale reduction applied to the back card (0.05 = 5%).
+ ///
+ public double BackCardScale { get; set; } = 0.05;
+
+ ///
+ /// Gets or sets the vertical offset (pixels) applied to the back card.
+ ///
+ public double BackCardOffset { get; set; } = 0.0;
+
+ ///
+ public override async Task Start(Visual? from, Visual? to, bool forward, CancellationToken cancellationToken)
+ {
+ if (cancellationToken.IsCancellationRequested)
+ {
+ return;
+ }
+
+ var tasks = new List();
+ var parent = GetVisualParent(from, to);
+ var distance = Orientation == PageSlide.SlideAxis.Horizontal ? parent.Bounds.Width : parent.Bounds.Height;
+ var translateProperty = Orientation == PageSlide.SlideAxis.Horizontal ? TranslateTransform.XProperty : TranslateTransform.YProperty;
+ var rotationTarget = Orientation == PageSlide.SlideAxis.Horizontal ? (forward ? -MaxSwipeAngle : MaxSwipeAngle) : 0.0;
+ var startScale = 1.0 - BackCardScale;
+
+ if (from != null)
+ {
+ var (rotate, translate) = EnsureTopTransforms(from);
+ rotate.Angle = 0;
+ translate.X = 0;
+ translate.Y = 0;
+ from.Opacity = 1;
+ from.ZIndex = 1;
+
+ var animation = new Animation
+ {
+ Easing = SlideOutEasing,
+ Duration = Duration,
+ FillMode = FillMode,
+ Children =
+ {
+ new KeyFrame
+ {
+ Setters =
+ {
+ new Setter(translateProperty, 0d),
+ new Setter(RotateTransform.AngleProperty, 0d)
+ },
+ Cue = new Cue(0d)
+ },
+ new KeyFrame
+ {
+ Setters =
+ {
+ new Setter(translateProperty, forward ? -distance : distance),
+ new Setter(RotateTransform.AngleProperty, rotationTarget)
+ },
+ Cue = new Cue(1d)
+ }
+ }
+ };
+ tasks.Add(animation.RunAsync(from, cancellationToken));
+ }
+
+ if (to != null)
+ {
+ var (scale, translate) = EnsureBackTransforms(to);
+ scale.ScaleX = startScale;
+ scale.ScaleY = startScale;
+ translate.X = 0;
+ translate.Y = BackCardOffset;
+ to.IsVisible = true;
+ to.Opacity = 1;
+ to.ZIndex = 0;
+
+ var animation = new Animation
+ {
+ Easing = SlideInEasing,
+ Duration = Duration,
+ FillMode = FillMode,
+ Children =
+ {
+ new KeyFrame
+ {
+ Setters =
+ {
+ new Setter(ScaleTransform.ScaleXProperty, startScale),
+ new Setter(ScaleTransform.ScaleYProperty, startScale),
+ new Setter(TranslateTransform.YProperty, BackCardOffset)
+ },
+ Cue = new Cue(0d)
+ },
+ new KeyFrame
+ {
+ Setters =
+ {
+ new Setter(ScaleTransform.ScaleXProperty, 1d),
+ new Setter(ScaleTransform.ScaleYProperty, 1d),
+ new Setter(TranslateTransform.YProperty, 0d)
+ },
+ Cue = new Cue(1d)
+ }
+ }
+ };
+
+ tasks.Add(animation.RunAsync(to, cancellationToken));
+ }
+
+ await Task.WhenAll(tasks);
+
+ if (from != null && !cancellationToken.IsCancellationRequested)
+ {
+ from.IsVisible = false;
+ }
+
+ if (!cancellationToken.IsCancellationRequested && to != null)
+ {
+ var (scale, translate) = EnsureBackTransforms(to);
+ scale.ScaleX = 1;
+ scale.ScaleY = 1;
+ translate.X = 0;
+ translate.Y = 0;
+ }
+ }
+
+ ///
+ public override void Update(
+ double progress,
+ Visual? from,
+ Visual? to,
+ bool forward,
+ double pageLength,
+ IReadOnlyList visibleItems)
+ {
+ if (visibleItems.Count > 0)
+ {
+ UpdateVisibleItems(progress, from, to, forward, pageLength, visibleItems);
+ return;
+ }
+
+ if (from is null && to is null)
+ return;
+
+ var parent = GetVisualParent(from, to);
+ var size = parent.Bounds.Size;
+ var isHorizontal = Orientation == PageSlide.SlideAxis.Horizontal;
+ var distance = pageLength > 0
+ ? pageLength
+ : (isHorizontal ? size.Width : size.Height);
+ var rotationTarget = isHorizontal ? (forward ? -MaxSwipeAngle : MaxSwipeAngle) : 0.0;
+ var startScale = 1.0 - BackCardScale;
+
+ if (from != null)
+ {
+ var (rotate, translate) = EnsureTopTransforms(from);
+ if (isHorizontal)
+ {
+ translate.X = forward ? -distance * progress : distance * progress;
+ translate.Y = 0;
+ }
+ else
+ {
+ translate.X = 0;
+ translate.Y = forward ? -distance * progress : distance * progress;
+ }
+
+ rotate.Angle = rotationTarget * progress;
+ from.IsVisible = true;
+ from.Opacity = 1;
+ from.ZIndex = 1;
+ }
+
+ if (to != null)
+ {
+ var (scale, translate) = EnsureBackTransforms(to);
+ var currentScale = startScale + (1.0 - startScale) * progress;
+ var currentOffset = BackCardOffset * (1.0 - progress);
+
+ scale.ScaleX = currentScale;
+ scale.ScaleY = currentScale;
+ if (isHorizontal)
+ {
+ translate.X = 0;
+ translate.Y = currentOffset;
+ }
+ else
+ {
+ translate.X = currentOffset;
+ translate.Y = 0;
+ }
+
+ to.IsVisible = true;
+ to.Opacity = 1;
+ to.ZIndex = 0;
+ }
+ }
+
+ ///
+ public override void Reset(Visual visual)
+ {
+ visual.RenderTransform = null;
+ visual.RenderTransformOrigin = default;
+ visual.Opacity = 1;
+ visual.ZIndex = 0;
+ }
+
+ private void UpdateVisibleItems(
+ double progress,
+ Visual? from,
+ Visual? to,
+ bool forward,
+ double pageLength,
+ IReadOnlyList visibleItems)
+ {
+ var isHorizontal = Orientation == PageSlide.SlideAxis.Horizontal;
+ var rotationTarget = isHorizontal
+ ? (forward ? -MaxSwipeAngle : MaxSwipeAngle)
+ : 0.0;
+ var stackOffset = GetViewportStackOffset(pageLength);
+ var lift = Math.Sin(Math.Clamp(progress, 0.0, 1.0) * Math.PI);
+
+ foreach (var item in visibleItems)
+ {
+ var visual = item.Visual;
+ var (rotate, scale, translate) = EnsureViewportTransforms(visual);
+ var depth = GetViewportDepth(item.ViewportCenterOffset);
+ var scaleValue = Math.Max(0.84, 1.0 - (BackCardScale * depth));
+ var stackValue = stackOffset * depth;
+ var baseOpacity = Math.Max(0.8, 1.0 - (ViewportDepthOpacityFalloff * depth));
+ var restingAngle = isHorizontal ? GetViewportRestingAngle(item.ViewportCenterOffset) : 0.0;
+
+ rotate.Angle = restingAngle;
+ scale.ScaleX = scaleValue;
+ scale.ScaleY = scaleValue;
+ translate.X = 0;
+ translate.Y = 0;
+
+ if (ReferenceEquals(visual, from))
+ {
+ rotate.Angle = restingAngle + (rotationTarget * progress);
+ stackValue -= stackOffset * 0.2 * lift;
+ baseOpacity = Math.Min(1.0, baseOpacity + 0.08);
+ }
+
+ if (ReferenceEquals(visual, to))
+ {
+ var promotedScale = Math.Min(1.0, scaleValue + (ViewportLiftScale * lift) + (ViewportPromotionScale * progress));
+ scale.ScaleX = promotedScale;
+ scale.ScaleY = promotedScale;
+ rotate.Angle = restingAngle * (1.0 - progress);
+ stackValue = Math.Max(0.0, stackValue - (stackOffset * (0.45 + (0.2 * lift)) * progress));
+ baseOpacity = Math.Min(1.0, baseOpacity + (0.12 * lift));
+ }
+
+ if (isHorizontal)
+ translate.Y = stackValue;
+ else
+ translate.X = stackValue;
+
+ visual.IsVisible = true;
+ visual.Opacity = baseOpacity;
+ visual.ZIndex = GetViewportZIndex(item.ViewportCenterOffset, visual, from, to);
+ }
+ }
+
+ private static (RotateTransform rotate, TranslateTransform translate) EnsureTopTransforms(Visual visual)
+ {
+ if (visual.RenderTransform is TransformGroup group &&
+ group.Children.Count == 2 &&
+ group.Children[0] is RotateTransform rotateTransform &&
+ group.Children[1] is TranslateTransform translateTransform)
+ {
+ visual.RenderTransformOrigin = new RelativePoint(0.5, 0.5, RelativeUnit.Relative);
+ return (rotateTransform, translateTransform);
+ }
+
+ var rotate = new RotateTransform();
+ var translate = new TranslateTransform();
+ visual.RenderTransform = new TransformGroup
+ {
+ Children =
+ {
+ rotate,
+ translate
+ }
+ };
+ visual.RenderTransformOrigin = new RelativePoint(0.5, 0.5, RelativeUnit.Relative);
+ return (rotate, translate);
+ }
+
+ private static (ScaleTransform scale, TranslateTransform translate) EnsureBackTransforms(Visual visual)
+ {
+ if (visual.RenderTransform is TransformGroup group &&
+ group.Children.Count == 2 &&
+ group.Children[0] is ScaleTransform scaleTransform &&
+ group.Children[1] is TranslateTransform translateTransform)
+ {
+ visual.RenderTransformOrigin = new RelativePoint(0.5, 0.5, RelativeUnit.Relative);
+ return (scaleTransform, translateTransform);
+ }
+
+ var scale = new ScaleTransform();
+ var translate = new TranslateTransform();
+ visual.RenderTransform = new TransformGroup
+ {
+ Children =
+ {
+ scale,
+ translate
+ }
+ };
+ visual.RenderTransformOrigin = new RelativePoint(0.5, 0.5, RelativeUnit.Relative);
+ return (scale, translate);
+ }
+
+ private static (RotateTransform rotate, ScaleTransform scale, TranslateTransform translate) EnsureViewportTransforms(Visual visual)
+ {
+ if (visual.RenderTransform is TransformGroup group &&
+ group.Children.Count == 3 &&
+ group.Children[0] is RotateTransform rotateTransform &&
+ group.Children[1] is ScaleTransform scaleTransform &&
+ group.Children[2] is TranslateTransform translateTransform)
+ {
+ visual.RenderTransformOrigin = new RelativePoint(0.5, 0.5, RelativeUnit.Relative);
+ return (rotateTransform, scaleTransform, translateTransform);
+ }
+
+ var rotate = new RotateTransform();
+ var scale = new ScaleTransform(1, 1);
+ var translate = new TranslateTransform();
+ visual.RenderTransform = new TransformGroup
+ {
+ Children =
+ {
+ rotate,
+ scale,
+ translate
+ }
+ };
+ visual.RenderTransformOrigin = new RelativePoint(0.5, 0.5, RelativeUnit.Relative);
+ return (rotate, scale, translate);
+ }
+
+ private double GetViewportStackOffset(double pageLength)
+ {
+ if (BackCardOffset > 0)
+ return BackCardOffset;
+
+ return Math.Clamp(pageLength * 0.045, 10.0, 18.0);
+ }
+
+ private static double GetViewportDepth(double offsetFromCenter)
+ {
+ var distance = Math.Abs(offsetFromCenter);
+
+ if (distance <= 1.0)
+ return distance;
+
+ if (distance <= 2.0)
+ return 1.0 + ((distance - 1.0) * 0.8);
+
+ return 1.8;
+ }
+
+ private static double GetViewportRestingAngle(double offsetFromCenter)
+ {
+ var sign = Math.Sign(offsetFromCenter);
+ if (sign == 0)
+ return 0;
+
+ var distance = Math.Abs(offsetFromCenter);
+ if (distance <= 1.0)
+ return sign * Lerp(0.0, SidePeekAngle, distance);
+
+ if (distance <= 2.0)
+ return sign * Lerp(SidePeekAngle, FarPeekAngle, distance - 1.0);
+
+ return sign * FarPeekAngle;
+ }
+
+ private static double Lerp(double from, double to, double t)
+ {
+ return from + ((to - from) * Math.Clamp(t, 0.0, 1.0));
+ }
+
+ private static int GetViewportZIndex(double offsetFromCenter, Visual visual, Visual? from, Visual? to)
+ {
+ if (ReferenceEquals(visual, from))
+ return 5;
+
+ if (ReferenceEquals(visual, to))
+ return 4;
+
+ var distance = Math.Abs(offsetFromCenter);
+ if (distance < 0.5)
+ return 4;
+ if (distance < 1.5)
+ return 3;
+ return 2;
+ }
+}
diff --git a/samples/ControlCatalog/Pages/Transitions/WaveRevealPageTransition.cs b/samples/ControlCatalog/Pages/Transitions/WaveRevealPageTransition.cs
new file mode 100644
index 0000000000..9d8e80bf9c
--- /dev/null
+++ b/samples/ControlCatalog/Pages/Transitions/WaveRevealPageTransition.cs
@@ -0,0 +1,380 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+using Avalonia;
+using Avalonia.Animation;
+using Avalonia.Animation.Easings;
+using Avalonia.Media;
+
+namespace ControlCatalog.Pages.Transitions;
+
+///
+/// Transitions between two pages using a wave clip that reveals the next page.
+///
+public class WaveRevealPageTransition : PageSlide
+{
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ public WaveRevealPageTransition()
+ {
+ }
+
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ /// The duration of the animation.
+ /// The axis on which the animation should occur.
+ public WaveRevealPageTransition(TimeSpan duration, PageSlide.SlideAxis orientation = PageSlide.SlideAxis.Horizontal)
+ : base(duration, orientation)
+ {
+ }
+
+ ///
+ /// Gets or sets the maximum wave bulge (pixels) along the movement axis.
+ ///
+ public double MaxBulge { get; set; } = 120.0;
+
+ ///
+ /// Gets or sets the bulge factor along the movement axis (0-1).
+ ///
+ public double BulgeFactor { get; set; } = 0.35;
+
+ ///
+ /// Gets or sets the bulge factor along the cross axis (0-1).
+ ///
+ public double CrossBulgeFactor { get; set; } = 0.3;
+
+ ///
+ /// Gets or sets a cross-axis offset (pixels) to shift the wave center.
+ ///
+ public double WaveCenterOffset { get; set; } = 0.0;
+
+ ///
+ /// Gets or sets how strongly the wave center follows the provided offset.
+ ///
+ public double CenterSensitivity { get; set; } = 1.0;
+
+ ///
+ /// Gets or sets the bulge exponent used to shape the wave (1.0 = linear).
+ /// Higher values tighten the bulge; lower values broaden it.
+ ///
+ public double BulgeExponent { get; set; } = 1.0;
+
+ ///
+ /// Gets or sets the easing applied to the wave progress (clip only).
+ ///
+ public Easing WaveEasing { get; set; } = new CubicEaseOut();
+
+ ///
+ public override async Task Start(Visual? from, Visual? to, bool forward, CancellationToken cancellationToken)
+ {
+ if (cancellationToken.IsCancellationRequested)
+ {
+ return;
+ }
+
+ if (to != null)
+ {
+ to.IsVisible = true;
+ to.ZIndex = 1;
+ }
+
+ if (from != null)
+ {
+ from.ZIndex = 0;
+ }
+
+ await AnimateProgress(0.0, 1.0, from, to, forward, cancellationToken);
+
+ if (to != null && !cancellationToken.IsCancellationRequested)
+ {
+ to.Clip = null;
+ }
+
+ if (from != null && !cancellationToken.IsCancellationRequested)
+ {
+ from.IsVisible = false;
+ }
+ }
+
+ ///
+ public override void Update(
+ double progress,
+ Visual? from,
+ Visual? to,
+ bool forward,
+ double pageLength,
+ IReadOnlyList visibleItems)
+ {
+ if (visibleItems.Count > 0)
+ {
+ UpdateVisibleItems(from, to, forward, pageLength, visibleItems);
+ return;
+ }
+
+ if (from is null && to is null)
+ return;
+ var parent = GetVisualParent(from, to);
+ var size = parent.Bounds.Size;
+ var centerOffset = WaveCenterOffset * CenterSensitivity;
+ var isHorizontal = Orientation == PageSlide.SlideAxis.Horizontal;
+
+ if (to != null)
+ {
+ to.IsVisible = progress > 0.0;
+ to.ZIndex = 1;
+ to.Opacity = 1;
+
+ if (progress >= 1.0)
+ {
+ to.Clip = null;
+ }
+ else
+ {
+ var waveProgress = WaveEasing?.Ease(progress) ?? progress;
+ var clip = LiquidSwipeClipper.CreateWavePath(
+ waveProgress,
+ size,
+ centerOffset,
+ forward,
+ isHorizontal,
+ MaxBulge,
+ BulgeFactor,
+ CrossBulgeFactor,
+ BulgeExponent);
+ to.Clip = clip;
+ }
+ }
+
+ if (from != null)
+ {
+ from.IsVisible = true;
+ from.ZIndex = 0;
+ from.Opacity = 1;
+ }
+ }
+
+ private void UpdateVisibleItems(
+ Visual? from,
+ Visual? to,
+ bool forward,
+ double pageLength,
+ IReadOnlyList visibleItems)
+ {
+ if (from is null && to is null)
+ return;
+
+ var parent = GetVisualParent(from, to);
+ var size = parent.Bounds.Size;
+ var centerOffset = WaveCenterOffset * CenterSensitivity;
+ var isHorizontal = Orientation == PageSlide.SlideAxis.Horizontal;
+ var resolvedPageLength = pageLength > 0
+ ? pageLength
+ : (isHorizontal ? size.Width : size.Height);
+ foreach (var item in visibleItems)
+ {
+ var visual = item.Visual;
+ visual.IsVisible = true;
+ visual.Opacity = 1;
+ visual.Clip = null;
+ visual.ZIndex = ReferenceEquals(visual, to) ? 1 : 0;
+
+ if (!ReferenceEquals(visual, to))
+ continue;
+
+ var visibleFraction = GetVisibleFraction(item.ViewportCenterOffset, size, resolvedPageLength, isHorizontal);
+ if (visibleFraction >= 1.0)
+ continue;
+
+ visual.Clip = LiquidSwipeClipper.CreateWavePath(
+ visibleFraction,
+ size,
+ centerOffset,
+ forward,
+ isHorizontal,
+ MaxBulge,
+ BulgeFactor,
+ CrossBulgeFactor,
+ BulgeExponent);
+ }
+ }
+
+ private static double GetVisibleFraction(double offsetFromCenter, Size viewportSize, double pageLength, bool isHorizontal)
+ {
+ if (pageLength <= 0)
+ return 1.0;
+
+ var viewportLength = isHorizontal ? viewportSize.Width : viewportSize.Height;
+ if (viewportLength <= 0)
+ return 0.0;
+
+ var viewportUnits = viewportLength / pageLength;
+ var edgePeek = Math.Max(0.0, (viewportUnits - 1.0) / 2.0);
+ return Math.Clamp(1.0 + edgePeek - Math.Abs(offsetFromCenter), 0.0, 1.0);
+ }
+
+ ///
+ public override void Reset(Visual visual)
+ {
+ visual.Clip = null;
+ visual.ZIndex = 0;
+ visual.Opacity = 1;
+ }
+
+ private async Task AnimateProgress(
+ double from,
+ double to,
+ Visual? fromVisual,
+ Visual? toVisual,
+ bool forward,
+ CancellationToken cancellationToken)
+ {
+ var parent = GetVisualParent(fromVisual, toVisual);
+ var pageLength = Orientation == PageSlide.SlideAxis.Horizontal
+ ? parent.Bounds.Width
+ : parent.Bounds.Height;
+ var durationMs = Math.Max(Duration.TotalMilliseconds * Math.Abs(to - from), 50);
+ var startTicks = Stopwatch.GetTimestamp();
+ var tickFreq = Stopwatch.Frequency;
+
+ while (!cancellationToken.IsCancellationRequested)
+ {
+ var elapsedMs = (Stopwatch.GetTimestamp() - startTicks) * 1000.0 / tickFreq;
+ var t = Math.Clamp(elapsedMs / durationMs, 0.0, 1.0);
+ var eased = SlideInEasing?.Ease(t) ?? t;
+ var progress = from + (to - from) * eased;
+
+ Update(progress, fromVisual, toVisual, forward, pageLength, Array.Empty());
+
+ if (t >= 1.0)
+ break;
+
+ await Task.Delay(16, cancellationToken);
+ }
+
+ if (!cancellationToken.IsCancellationRequested)
+ {
+ Update(to, fromVisual, toVisual, forward, pageLength, Array.Empty());
+ }
+ }
+
+ private static class LiquidSwipeClipper
+ {
+ public static Geometry CreateWavePath(
+ double progress,
+ Size size,
+ double waveCenterOffset,
+ bool forward,
+ bool isHorizontal,
+ double maxBulge,
+ double bulgeFactor,
+ double crossBulgeFactor,
+ double bulgeExponent)
+ {
+ var width = size.Width;
+ var height = size.Height;
+
+ if (progress <= 0)
+ return new RectangleGeometry(new Rect(0, 0, 0, 0));
+
+ if (progress >= 1)
+ return new RectangleGeometry(new Rect(0, 0, width, height));
+
+ if (width <= 0 || height <= 0)
+ return new RectangleGeometry(new Rect(0, 0, 0, 0));
+
+ var mainLength = isHorizontal ? width : height;
+ var crossLength = isHorizontal ? height : width;
+
+ var wavePhase = Math.Sin(progress * Math.PI);
+ var bulgeProgress = bulgeExponent == 1.0 ? wavePhase : Math.Pow(wavePhase, bulgeExponent);
+ var revealedLength = mainLength * progress;
+ var bulgeMain = Math.Min(mainLength * bulgeFactor, maxBulge) * bulgeProgress;
+ bulgeMain = Math.Min(bulgeMain, revealedLength * 0.45);
+ var bulgeCross = crossLength * crossBulgeFactor;
+
+ var waveCenter = crossLength / 2 + waveCenterOffset;
+ waveCenter = Math.Clamp(waveCenter, bulgeCross, crossLength - bulgeCross);
+
+ var geometry = new StreamGeometry();
+ using (var context = geometry.Open())
+ {
+ if (isHorizontal)
+ {
+ if (forward)
+ {
+ var waveX = width * (1 - progress);
+ context.BeginFigure(new Point(width, 0), true);
+ context.LineTo(new Point(waveX, 0));
+ context.CubicBezierTo(
+ new Point(waveX, waveCenter - bulgeCross),
+ new Point(waveX - bulgeMain, waveCenter - bulgeCross * 0.5),
+ new Point(waveX - bulgeMain, waveCenter));
+ context.CubicBezierTo(
+ new Point(waveX - bulgeMain, waveCenter + bulgeCross * 0.5),
+ new Point(waveX, waveCenter + bulgeCross),
+ new Point(waveX, height));
+ context.LineTo(new Point(width, height));
+ context.EndFigure(true);
+ }
+ else
+ {
+ var waveX = width * progress;
+ context.BeginFigure(new Point(0, 0), true);
+ context.LineTo(new Point(waveX, 0));
+ context.CubicBezierTo(
+ new Point(waveX, waveCenter - bulgeCross),
+ new Point(waveX + bulgeMain, waveCenter - bulgeCross * 0.5),
+ new Point(waveX + bulgeMain, waveCenter));
+ context.CubicBezierTo(
+ new Point(waveX + bulgeMain, waveCenter + bulgeCross * 0.5),
+ new Point(waveX, waveCenter + bulgeCross),
+ new Point(waveX, height));
+ context.LineTo(new Point(0, height));
+ context.EndFigure(true);
+ }
+ }
+ else
+ {
+ if (forward)
+ {
+ var waveY = height * (1 - progress);
+ context.BeginFigure(new Point(0, height), true);
+ context.LineTo(new Point(0, waveY));
+ context.CubicBezierTo(
+ new Point(waveCenter - bulgeCross, waveY),
+ new Point(waveCenter - bulgeCross * 0.5, waveY - bulgeMain),
+ new Point(waveCenter, waveY - bulgeMain));
+ context.CubicBezierTo(
+ new Point(waveCenter + bulgeCross * 0.5, waveY - bulgeMain),
+ new Point(waveCenter + bulgeCross, waveY),
+ new Point(width, waveY));
+ context.LineTo(new Point(width, height));
+ context.EndFigure(true);
+ }
+ else
+ {
+ var waveY = height * progress;
+ context.BeginFigure(new Point(0, 0), true);
+ context.LineTo(new Point(0, waveY));
+ context.CubicBezierTo(
+ new Point(waveCenter - bulgeCross, waveY),
+ new Point(waveCenter - bulgeCross * 0.5, waveY + bulgeMain),
+ new Point(waveCenter, waveY + bulgeMain));
+ context.CubicBezierTo(
+ new Point(waveCenter + bulgeCross * 0.5, waveY + bulgeMain),
+ new Point(waveCenter + bulgeCross, waveY),
+ new Point(width, waveY));
+ context.LineTo(new Point(width, 0));
+ context.EndFigure(true);
+ }
+ }
+ }
+
+ return geometry;
+ }
+ }
+}
diff --git a/samples/interop/WindowsInteropTest/EmbedToWinFormsDemo.Designer.cs b/samples/interop/WindowsInteropTest/EmbedToWinFormsDemo.Designer.cs
index d8b0724520..48087a9058 100644
--- a/samples/interop/WindowsInteropTest/EmbedToWinFormsDemo.Designer.cs
+++ b/samples/interop/WindowsInteropTest/EmbedToWinFormsDemo.Designer.cs
@@ -30,87 +30,88 @@ namespace WindowsInteropTest
///
private void InitializeComponent()
{
- this.button1 = new System.Windows.Forms.Button();
- this.monthCalendar1 = new System.Windows.Forms.MonthCalendar();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.groupBox2 = new System.Windows.Forms.GroupBox();
- this.avaloniaHost = new WinFormsAvaloniaControlHost();
- this.groupBox1.SuspendLayout();
- this.groupBox2.SuspendLayout();
- this.SuspendLayout();
- //
- // button1
- //
- this.button1.Location = new System.Drawing.Point(28, 29);
- this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(164, 73);
- this.button1.TabIndex = 0;
- this.button1.Text = "button1";
- this.button1.UseVisualStyleBackColor = true;
- //
+ OpenWindowButton = new System.Windows.Forms.Button();
+ monthCalendar1 = new System.Windows.Forms.MonthCalendar();
+ groupBox1 = new System.Windows.Forms.GroupBox();
+ groupBox2 = new System.Windows.Forms.GroupBox();
+ avaloniaHost = new Avalonia.Win32.Interoperability.WinFormsAvaloniaControlHost();
+ groupBox1.SuspendLayout();
+ groupBox2.SuspendLayout();
+ SuspendLayout();
+ //
+ // OpenWindowButton
+ //
+ OpenWindowButton.Location = new System.Drawing.Point(33, 33);
+ OpenWindowButton.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ OpenWindowButton.Name = "OpenWindowButton";
+ OpenWindowButton.Size = new System.Drawing.Size(191, 84);
+ OpenWindowButton.TabIndex = 0;
+ OpenWindowButton.Text = "Open Avalonia Window";
+ OpenWindowButton.UseVisualStyleBackColor = true;
+ OpenWindowButton.Click += OpenWindowButton_Click;
+ //
// monthCalendar1
- //
- this.monthCalendar1.Location = new System.Drawing.Point(28, 114);
- this.monthCalendar1.Name = "monthCalendar1";
- this.monthCalendar1.TabIndex = 1;
- //
+ //
+ monthCalendar1.Location = new System.Drawing.Point(33, 132);
+ monthCalendar1.Margin = new System.Windows.Forms.Padding(10);
+ monthCalendar1.Name = "monthCalendar1";
+ monthCalendar1.TabIndex = 1;
+ //
// groupBox1
- //
- this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)));
- this.groupBox1.Controls.Add(this.button1);
- this.groupBox1.Controls.Add(this.monthCalendar1);
- this.groupBox1.Location = new System.Drawing.Point(12, 12);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(227, 418);
- this.groupBox1.TabIndex = 2;
- this.groupBox1.TabStop = false;
- this.groupBox1.Text = "WinForms";
- //
+ //
+ groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left));
+ groupBox1.Controls.Add(OpenWindowButton);
+ groupBox1.Controls.Add(monthCalendar1);
+ groupBox1.Location = new System.Drawing.Point(14, 14);
+ groupBox1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ groupBox1.Name = "groupBox1";
+ groupBox1.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ groupBox1.Size = new System.Drawing.Size(265, 482);
+ groupBox1.TabIndex = 2;
+ groupBox1.TabStop = false;
+ groupBox1.Text = "WinForms";
+ //
// groupBox2
- //
- this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.groupBox2.Controls.Add(this.avaloniaHost);
- this.groupBox2.Location = new System.Drawing.Point(245, 12);
- this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(501, 418);
- this.groupBox2.TabIndex = 3;
- this.groupBox2.TabStop = false;
- this.groupBox2.Text = "Avalonia";
- //
+ //
+ groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right));
+ groupBox2.Controls.Add(avaloniaHost);
+ groupBox2.Location = new System.Drawing.Point(286, 14);
+ groupBox2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ groupBox2.Name = "groupBox2";
+ groupBox2.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ groupBox2.Size = new System.Drawing.Size(584, 482);
+ groupBox2.TabIndex = 3;
+ groupBox2.TabStop = false;
+ groupBox2.Text = "Avalonia";
+ //
// avaloniaHost
- //
- this.avaloniaHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.avaloniaHost.Content = null;
- this.avaloniaHost.Location = new System.Drawing.Point(6, 19);
- this.avaloniaHost.Name = "avaloniaHost";
- this.avaloniaHost.Size = new System.Drawing.Size(489, 393);
- this.avaloniaHost.TabIndex = 0;
- this.avaloniaHost.Text = "avaloniaHost";
- //
+ //
+ avaloniaHost.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right));
+ avaloniaHost.Location = new System.Drawing.Point(7, 22);
+ avaloniaHost.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ avaloniaHost.Name = "avaloniaHost";
+ avaloniaHost.Size = new System.Drawing.Size(570, 453);
+ avaloniaHost.TabIndex = 0;
+ avaloniaHost.Text = "avaloniaHost";
+ //
// EmbedToWinFormsDemo
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(758, 442);
- this.Controls.Add(this.groupBox2);
- this.Controls.Add(this.groupBox1);
- this.MinimumSize = new System.Drawing.Size(600, 400);
- this.Name = "EmbedToWinFormsDemo";
- this.Text = "EmbedToWinFormsDemo";
- this.groupBox1.ResumeLayout(false);
- this.groupBox2.ResumeLayout(false);
- this.ResumeLayout(false);
-
+ //
+ AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+ AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ ClientSize = new System.Drawing.Size(884, 510);
+ Controls.Add(groupBox2);
+ Controls.Add(groupBox1);
+ Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ MinimumSize = new System.Drawing.Size(697, 456);
+ Text = "EmbedToWinFormsDemo";
+ groupBox1.ResumeLayout(false);
+ groupBox2.ResumeLayout(false);
+ ResumeLayout(false);
}
#endregion
- private System.Windows.Forms.Button button1;
+ private System.Windows.Forms.Button OpenWindowButton;
private System.Windows.Forms.MonthCalendar monthCalendar1;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.GroupBox groupBox2;
diff --git a/samples/interop/WindowsInteropTest/EmbedToWinFormsDemo.cs b/samples/interop/WindowsInteropTest/EmbedToWinFormsDemo.cs
index d37ed13559..69dfcb1bbc 100644
--- a/samples/interop/WindowsInteropTest/EmbedToWinFormsDemo.cs
+++ b/samples/interop/WindowsInteropTest/EmbedToWinFormsDemo.cs
@@ -1,5 +1,10 @@
-using System.Windows.Forms;
+using System;
+using System.Windows.Forms;
using ControlCatalog;
+using AvaloniaButton = Avalonia.Controls.Button;
+using AvaloniaStackPanel = Avalonia.Controls.StackPanel;
+using AvaloniaTextBox = Avalonia.Controls.TextBox;
+using AvaloniaWindow = Avalonia.Controls.Window;
namespace WindowsInteropTest
{
@@ -10,5 +15,23 @@ namespace WindowsInteropTest
InitializeComponent();
avaloniaHost.Content = new MainView();
}
+
+ private void OpenWindowButton_Click(object sender, EventArgs e)
+ {
+ var window = new AvaloniaWindow
+ {
+ Width = 300,
+ Height = 300,
+ Content = new AvaloniaStackPanel
+ {
+ Children =
+ {
+ new AvaloniaButton { Content = "Button" },
+ new AvaloniaTextBox { Text = "Text" }
+ }
+ }
+ };
+ window.Show();
+ }
}
}
diff --git a/samples/interop/WindowsInteropTest/Program.cs b/samples/interop/WindowsInteropTest/Program.cs
index 4ebb88642b..8ef01523d9 100644
--- a/samples/interop/WindowsInteropTest/Program.cs
+++ b/samples/interop/WindowsInteropTest/Program.cs
@@ -1,6 +1,7 @@
using System;
using ControlCatalog;
using Avalonia;
+using Avalonia.Win32.Interoperability;
namespace WindowsInteropTest
{
@@ -14,9 +15,11 @@ namespace WindowsInteropTest
{
System.Windows.Forms.Application.EnableVisualStyles();
System.Windows.Forms.Application.SetCompatibleTextRenderingDefault(false);
+ System.Windows.Forms.Application.AddMessageFilter(new WinFormsAvaloniaMessageFilter());
AppBuilder.Configure()
.UseWin32()
.UseSkia()
+ .UseHarfBuzz()
.SetupWithoutStarting();
System.Windows.Forms.Application.Run(new EmbedToWinFormsDemo());
}
diff --git a/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj b/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj
index 576910ca3d..e282d93121 100644
--- a/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj
+++ b/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj
@@ -8,6 +8,7 @@
+
diff --git a/src/Avalonia.Base/Animation/CompositePageTransition.cs b/src/Avalonia.Base/Animation/CompositePageTransition.cs
index 62119a0051..e5e3511337 100644
--- a/src/Avalonia.Base/Animation/CompositePageTransition.cs
+++ b/src/Avalonia.Base/Animation/CompositePageTransition.cs
@@ -28,7 +28,7 @@ namespace Avalonia.Animation
///
///
///
- public class CompositePageTransition : IPageTransition
+ public class CompositePageTransition : IPageTransition, IProgressPageTransition
{
///
/// Gets or sets the transitions to be executed. Can be defined from XAML.
@@ -44,5 +44,35 @@ namespace Avalonia.Animation
.ToArray();
return Task.WhenAll(transitionTasks);
}
+
+ ///
+ public void Update(
+ double progress,
+ Visual? from,
+ Visual? to,
+ bool forward,
+ double pageLength,
+ IReadOnlyList visibleItems)
+ {
+ foreach (var transition in PageTransitions)
+ {
+ if (transition is IProgressPageTransition progressive)
+ {
+ progressive.Update(progress, from, to, forward, pageLength, visibleItems);
+ }
+ }
+ }
+
+ ///
+ public void Reset(Visual visual)
+ {
+ foreach (var transition in PageTransitions)
+ {
+ if (transition is IProgressPageTransition progressive)
+ {
+ progressive.Reset(visual);
+ }
+ }
+ }
}
}
diff --git a/src/Avalonia.Base/Animation/CrossFade.cs b/src/Avalonia.Base/Animation/CrossFade.cs
index f00d835020..45a4300e5b 100644
--- a/src/Avalonia.Base/Animation/CrossFade.cs
+++ b/src/Avalonia.Base/Animation/CrossFade.cs
@@ -12,8 +12,13 @@ namespace Avalonia.Animation
///
/// Defines a cross-fade animation between two s.
///
- public class CrossFade : IPageTransition
+ public class CrossFade : IPageTransition, IProgressPageTransition
{
+ private const double SidePeekOpacity = 0.72;
+ private const double FarPeekOpacity = 0.42;
+ private const double OutgoingDip = 0.22;
+ private const double IncomingBoost = 0.12;
+ private const double PassiveDip = 0.05;
private readonly Animation _fadeOutAnimation;
private readonly Animation _fadeInAnimation;
@@ -182,5 +187,82 @@ namespace Avalonia.Animation
{
return Start(from, to, cancellationToken);
}
+
+ ///
+ public void Update(
+ double progress,
+ Visual? from,
+ Visual? to,
+ bool forward,
+ double pageLength,
+ IReadOnlyList visibleItems)
+ {
+ if (visibleItems.Count > 0)
+ {
+ UpdateVisibleItems(progress, from, to, visibleItems);
+ return;
+ }
+
+ if (from != null)
+ from.Opacity = 1 - progress;
+ if (to != null)
+ {
+ to.IsVisible = true;
+ to.Opacity = progress;
+ }
+ }
+
+ ///
+ public void Reset(Visual visual)
+ {
+ visual.Opacity = 1;
+ }
+
+ private static void UpdateVisibleItems(
+ double progress,
+ Visual? from,
+ Visual? to,
+ IReadOnlyList visibleItems)
+ {
+ var emphasis = Math.Sin(Math.Clamp(progress, 0.0, 1.0) * Math.PI);
+ foreach (var item in visibleItems)
+ {
+ item.Visual.IsVisible = true;
+ var opacity = GetOpacityForOffset(item.ViewportCenterOffset);
+
+ if (ReferenceEquals(item.Visual, from))
+ {
+ opacity = Math.Max(FarPeekOpacity, opacity - (OutgoingDip * emphasis));
+ }
+ else if (ReferenceEquals(item.Visual, to))
+ {
+ opacity = Math.Min(1.0, opacity + (IncomingBoost * emphasis));
+ }
+ else
+ {
+ opacity = Math.Max(FarPeekOpacity, opacity - (PassiveDip * emphasis));
+ }
+
+ item.Visual.Opacity = opacity;
+ }
+ }
+
+ private static double GetOpacityForOffset(double offsetFromCenter)
+ {
+ var distance = Math.Abs(offsetFromCenter);
+
+ if (distance <= 1.0)
+ return Lerp(1.0, SidePeekOpacity, distance);
+
+ if (distance <= 2.0)
+ return Lerp(SidePeekOpacity, FarPeekOpacity, distance - 1.0);
+
+ return FarPeekOpacity;
+ }
+
+ private static double Lerp(double from, double to, double t)
+ {
+ return from + ((to - from) * Math.Clamp(t, 0.0, 1.0));
+ }
}
}
diff --git a/src/Avalonia.Base/Animation/IProgressPageTransition.cs b/src/Avalonia.Base/Animation/IProgressPageTransition.cs
new file mode 100644
index 0000000000..01f892d1fd
--- /dev/null
+++ b/src/Avalonia.Base/Animation/IProgressPageTransition.cs
@@ -0,0 +1,39 @@
+using System.Collections.Generic;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Animation
+{
+ ///
+ /// An that supports progress-driven updates.
+ ///
+ ///
+ /// Transitions implementing this interface can be driven by a normalized progress value
+ /// (0.0 to 1.0) during swipe gestures or programmatic animations, rather than running
+ /// as a timed animation via .
+ ///
+ public interface IProgressPageTransition : IPageTransition
+ {
+ ///
+ /// Updates the transition to reflect the given progress.
+ ///
+ /// The normalized progress value from 0.0 (start) to 1.0 (complete).
+ /// The visual being transitioned away from. May be null.
+ /// The visual being transitioned to. May be null.
+ /// Whether the transition direction is forward (next) or backward (previous).
+ /// The size of a page along the transition axis.
+ /// The currently visible realized pages, if more than one page is visible.
+ void Update(
+ double progress,
+ Visual? from,
+ Visual? to,
+ bool forward,
+ double pageLength,
+ IReadOnlyList visibleItems);
+
+ ///
+ /// Resets any visual state applied to the given visual by this transition.
+ ///
+ /// The visual to reset.
+ void Reset(Visual visual);
+ }
+}
diff --git a/src/Avalonia.Base/Animation/PageSlide.cs b/src/Avalonia.Base/Animation/PageSlide.cs
index 24797a6d80..d75f391c79 100644
--- a/src/Avalonia.Base/Animation/PageSlide.cs
+++ b/src/Avalonia.Base/Animation/PageSlide.cs
@@ -12,7 +12,7 @@ namespace Avalonia.Animation
///
/// Transitions between two pages by sliding them horizontally or vertically.
///
- public class PageSlide : IPageTransition
+ public class PageSlide : IPageTransition, IProgressPageTransition
{
///
/// The axis on which the PageSlide should occur
@@ -50,12 +50,12 @@ namespace Avalonia.Animation
/// Gets the orientation of the animation.
///
public SlideAxis Orientation { get; set; }
-
+
///
/// Gets or sets element entrance easing.
///
public Easing SlideInEasing { get; set; } = new LinearEasing();
-
+
///
/// Gets or sets element exit easing.
///
@@ -152,8 +152,6 @@ namespace Avalonia.Animation
if (from != null)
{
- // Hide BEFORE resetting transform so there is no single-frame flash
- // where the element snaps back to position 0 while still visible.
from.IsVisible = false;
if (FillMode != FillMode.None)
from.RenderTransform = null;
@@ -163,6 +161,55 @@ namespace Avalonia.Animation
to.RenderTransform = null;
}
+ ///
+ public virtual void Update(
+ double progress,
+ Visual? from,
+ Visual? to,
+ bool forward,
+ double pageLength,
+ IReadOnlyList visibleItems)
+ {
+ if (visibleItems.Count > 0)
+ return;
+
+ if (from is null && to is null)
+ return;
+
+ var parent = GetVisualParent(from, to);
+ var distance = pageLength > 0
+ ? pageLength
+ : (Orientation == SlideAxis.Horizontal ? parent.Bounds.Width : parent.Bounds.Height);
+ var offset = distance * progress;
+
+ if (from != null)
+ {
+ if (from.RenderTransform is not TranslateTransform ft)
+ from.RenderTransform = ft = new TranslateTransform();
+ if (Orientation == SlideAxis.Horizontal)
+ ft.X = forward ? -offset : offset;
+ else
+ ft.Y = forward ? -offset : offset;
+ }
+
+ if (to != null)
+ {
+ to.IsVisible = true;
+ if (to.RenderTransform is not TranslateTransform tt)
+ to.RenderTransform = tt = new TranslateTransform();
+ if (Orientation == SlideAxis.Horizontal)
+ tt.X = forward ? distance - offset : -(distance - offset);
+ else
+ tt.Y = forward ? distance - offset : -(distance - offset);
+ }
+ }
+
+ ///
+ public virtual void Reset(Visual visual)
+ {
+ visual.RenderTransform = null;
+ }
+
///
/// Gets the common visual parent of the two control.
///
diff --git a/src/Avalonia.Base/Animation/PageTransitionItem.cs b/src/Avalonia.Base/Animation/PageTransitionItem.cs
new file mode 100644
index 0000000000..fed0145a2a
--- /dev/null
+++ b/src/Avalonia.Base/Animation/PageTransitionItem.cs
@@ -0,0 +1,12 @@
+using Avalonia.VisualTree;
+
+namespace Avalonia.Animation
+{
+ ///
+ /// Describes a single visible page within a carousel viewport.
+ ///
+ public readonly record struct PageTransitionItem(
+ int Index,
+ Visual Visual,
+ double ViewportCenterOffset);
+}
diff --git a/src/Avalonia.Base/Animation/Transitions/Rotate3DTransition.cs b/src/Avalonia.Base/Animation/Transitions/Rotate3DTransition.cs
index 239f3aea08..1075198881 100644
--- a/src/Avalonia.Base/Animation/Transitions/Rotate3DTransition.cs
+++ b/src/Avalonia.Base/Animation/Transitions/Rotate3DTransition.cs
@@ -1,4 +1,5 @@
using System;
+using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using Avalonia.Media;
@@ -8,6 +9,8 @@ namespace Avalonia.Animation;
public class Rotate3DTransition: PageSlide
{
+ private const double SidePeekAngle = 24.0;
+ private const double FarPeekAngle = 38.0;
///
/// Creates a new instance of the
@@ -20,7 +23,7 @@ public class Rotate3DTransition: PageSlide
{
Depth = depth;
}
-
+
///
/// Defines the depth of the 3D Effect. If null, depth will be calculated automatically from the width or height
/// of the common parent of the visual being rotated.
@@ -28,12 +31,12 @@ public class Rotate3DTransition: PageSlide
public double? Depth { get; set; }
///
- /// Creates a new instance of the
+ /// Initializes a new instance of the class.
///
public Rotate3DTransition() { }
///
- public override async Task Start(Visual? @from, Visual? to, bool forward, CancellationToken cancellationToken)
+ public override async Task Start(Visual? from, Visual? to, bool forward, CancellationToken cancellationToken)
{
if (cancellationToken.IsCancellationRequested)
{
@@ -49,11 +52,12 @@ public class Rotate3DTransition: PageSlide
_ => throw new ArgumentOutOfRangeException()
};
- var depthSetter = new Setter {Property = Rotate3DTransform.DepthProperty, Value = Depth ?? center};
- var centerZSetter = new Setter {Property = Rotate3DTransform.CenterZProperty, Value = -center / 2};
+ var depthSetter = new Setter { Property = Rotate3DTransform.DepthProperty, Value = Depth ?? center };
+ var centerZSetter = new Setter { Property = Rotate3DTransform.CenterZProperty, Value = -center / 2 };
- KeyFrame CreateKeyFrame(double cue, double rotation, int zIndex, bool isVisible = true) =>
- new() {
+ KeyFrame CreateKeyFrame(double cue, double rotation, int zIndex, bool isVisible = true) =>
+ new()
+ {
Setters =
{
new Setter { Property = rotateProperty, Value = rotation },
@@ -71,7 +75,7 @@ public class Rotate3DTransition: PageSlide
{
Easing = SlideOutEasing,
Duration = Duration,
- FillMode = FillMode.Forward,
+ FillMode = FillMode,
Children =
{
CreateKeyFrame(0d, 0d, 2),
@@ -90,7 +94,7 @@ public class Rotate3DTransition: PageSlide
{
Easing = SlideInEasing,
Duration = Duration,
- FillMode = FillMode.Forward,
+ FillMode = FillMode,
Children =
{
CreateKeyFrame(0d, 90d * (forward ? 1 : -1), 1),
@@ -107,10 +111,8 @@ public class Rotate3DTransition: PageSlide
if (!cancellationToken.IsCancellationRequested)
{
if (to != null)
- {
to.ZIndex = 2;
- }
-
+
if (from != null)
{
from.IsVisible = false;
@@ -118,4 +120,139 @@ public class Rotate3DTransition: PageSlide
}
}
}
+
+ ///
+ public override void Update(
+ double progress,
+ Visual? from,
+ Visual? to,
+ bool forward,
+ double pageLength,
+ IReadOnlyList visibleItems)
+ {
+ if (visibleItems.Count > 0)
+ {
+ UpdateVisibleItems(progress, from, to, pageLength, visibleItems);
+ return;
+ }
+
+ if (from is null && to is null)
+ return;
+
+ var parent = GetVisualParent(from, to);
+ var center = pageLength > 0
+ ? pageLength
+ : (Orientation == SlideAxis.Vertical ? parent.Bounds.Height : parent.Bounds.Width);
+ var depth = Depth ?? center;
+ var sign = forward ? 1.0 : -1.0;
+
+ if (from != null)
+ {
+ if (from.RenderTransform is not Rotate3DTransform ft)
+ from.RenderTransform = ft = new Rotate3DTransform();
+ ft.Depth = depth;
+ ft.CenterZ = -center / 2;
+ from.ZIndex = progress < 0.5 ? 2 : 1;
+ if (Orientation == SlideAxis.Horizontal)
+ ft.AngleY = -sign * 90.0 * progress;
+ else
+ ft.AngleX = -sign * 90.0 * progress;
+ }
+
+ if (to != null)
+ {
+ to.IsVisible = true;
+ if (to.RenderTransform is not Rotate3DTransform tt)
+ to.RenderTransform = tt = new Rotate3DTransform();
+ tt.Depth = depth;
+ tt.CenterZ = -center / 2;
+ to.ZIndex = progress < 0.5 ? 1 : 2;
+ if (Orientation == SlideAxis.Horizontal)
+ tt.AngleY = sign * 90.0 * (1.0 - progress);
+ else
+ tt.AngleX = sign * 90.0 * (1.0 - progress);
+ }
+ }
+
+ private void UpdateVisibleItems(
+ double progress,
+ Visual? from,
+ Visual? to,
+ double pageLength,
+ IReadOnlyList visibleItems)
+ {
+ var anchor = from ?? to ?? visibleItems[0].Visual;
+ if (anchor.VisualParent is not Visual parent)
+ return;
+
+ var center = pageLength > 0
+ ? pageLength
+ : (Orientation == SlideAxis.Vertical ? parent.Bounds.Height : parent.Bounds.Width);
+ var depth = Depth ?? center;
+ var angleStrength = Math.Sin(Math.Clamp(progress, 0.0, 1.0) * Math.PI);
+
+ foreach (var item in visibleItems)
+ {
+ var visual = item.Visual;
+ visual.IsVisible = true;
+ visual.ZIndex = GetZIndex(item.ViewportCenterOffset);
+
+ if (visual.RenderTransform is not Rotate3DTransform transform)
+ visual.RenderTransform = transform = new Rotate3DTransform();
+
+ transform.Depth = depth;
+ transform.CenterZ = -center / 2;
+
+ var angle = GetAngleForOffset(item.ViewportCenterOffset) * angleStrength;
+ if (Orientation == SlideAxis.Horizontal)
+ {
+ transform.AngleY = angle;
+ transform.AngleX = 0;
+ }
+ else
+ {
+ transform.AngleX = angle;
+ transform.AngleY = 0;
+ }
+ }
+ }
+
+ private static double GetAngleForOffset(double offsetFromCenter)
+ {
+ var sign = Math.Sign(offsetFromCenter);
+ if (sign == 0)
+ return 0;
+
+ var distance = Math.Abs(offsetFromCenter);
+ if (distance <= 1.0)
+ return sign * Lerp(0.0, SidePeekAngle, distance);
+
+ if (distance <= 2.0)
+ return sign * Lerp(SidePeekAngle, FarPeekAngle, distance - 1.0);
+
+ return sign * FarPeekAngle;
+ }
+
+ private static int GetZIndex(double offsetFromCenter)
+ {
+ var distance = Math.Abs(offsetFromCenter);
+
+ if (distance < 0.5)
+ return 3;
+ if (distance < 1.5)
+ return 2;
+ return 1;
+ }
+
+ private static double Lerp(double from, double to, double t)
+ {
+ return from + ((to - from) * Math.Clamp(t, 0.0, 1.0));
+ }
+
+ ///
+ public override void Reset(Visual visual)
+ {
+ visual.RenderTransform = null;
+ visual.ZIndex = 0;
+ }
}
diff --git a/src/Avalonia.Base/Input/FindNextElementOptions.cs b/src/Avalonia.Base/Input/FindNextElementOptions.cs
index e6062daf9b..72d83ec419 100644
--- a/src/Avalonia.Base/Input/FindNextElementOptions.cs
+++ b/src/Avalonia.Base/Input/FindNextElementOptions.cs
@@ -6,12 +6,49 @@ using System.Threading.Tasks;
namespace Avalonia.Input
{
+ ///
+ /// Provides options to customize the behavior when identifying the next element to focus
+ /// during a navigation operation.
+ ///
public sealed class FindNextElementOptions
{
+ ///
+ /// Gets or sets the root within which the search for the next
+ /// focusable element will be conducted.
+ ///
+ ///
+ /// This property defines the boundary for focus navigation operations. It determines the root element
+ /// in the visual tree under which the focusable item search is performed. If not specified, the search
+ /// will default to the current scope.
+ ///
public InputElement? SearchRoot { get; init; }
+
+ ///
+ /// Gets or sets the rectangular region within the visual hierarchy that will be excluded
+ /// from consideration during focus navigation.
+ ///
public Rect ExclusionRect { get; init; }
+
+ ///
+ /// Gets or sets a rectangular region that serves as a hint for focus navigation.
+ /// This property specifies a rectangle, relative to the coordinate system of the search root,
+ /// which can be used as a preferred or prioritized target when navigating focus.
+ /// It can be null if no specific hint region is provided.
+ ///
public Rect? FocusHintRectangle { get; init; }
+
+ ///
+ /// Specifies an optional override for the navigation strategy used in XY focus navigation.
+ /// This property allows customizing the focus movement behavior when navigating between UI elements.
+ ///
public XYFocusNavigationStrategy? NavigationStrategyOverride { get; init; }
+
+ ///
+ /// Specifies whether occlusivity (overlapping of elements or obstructions)
+ /// should be ignored during focus navigation. When set to true,
+ /// the navigation logic disregards obstructions that may block a potential
+ /// focus target, allowing elements behind such obstructions to be considered.
+ ///
public bool IgnoreOcclusivity { get; init; }
}
}
diff --git a/src/Avalonia.Base/Input/FocusManager.cs b/src/Avalonia.Base/Input/FocusManager.cs
index 15b8fea77d..dc62171f48 100644
--- a/src/Avalonia.Base/Input/FocusManager.cs
+++ b/src/Avalonia.Base/Input/FocusManager.cs
@@ -4,7 +4,6 @@ using System.Linq;
using Avalonia.Input.Navigation;
using Avalonia.Interactivity;
using Avalonia.Metadata;
-using Avalonia.Reactive;
using Avalonia.VisualTree;
namespace Avalonia.Input
@@ -12,7 +11,6 @@ namespace Avalonia.Input
///
/// Manages focus for the application.
///
- [PrivateApi]
public class FocusManager : IFocusManager
{
///
@@ -42,58 +40,51 @@ namespace Avalonia.Input
RoutingStrategies.Tunnel);
}
+ [PrivateApi]
public FocusManager()
{
- _contentRoot = null;
}
- public FocusManager(IInputElement contentRoot)
- {
- _contentRoot = contentRoot;
- }
-
- internal void SetContentRoot(IInputElement? contentRoot)
+ ///
+ /// Gets or sets the content root for the focus management system.
+ ///
+ [PrivateApi]
+ public IInputElement? ContentRoot
{
- _contentRoot = contentRoot;
+ get => _contentRoot;
+ set => _contentRoot = value;
}
private IInputElement? Current => KeyboardDevice.Instance?.FocusedElement;
- private XYFocus _xyFocus = new();
- private XYFocusOptions _xYFocusOptions = new XYFocusOptions();
+ private readonly XYFocus _xyFocus = new();
private IInputElement? _contentRoot;
+ private XYFocusOptions? _reusableFocusOptions;
- ///
- /// Gets the currently focused .
- ///
+ ///
public IInputElement? GetFocusedElement() => Current;
- ///
- /// Focuses a control.
- ///
- /// The control to focus.
- /// The method by which focus was changed.
- /// Any key modifiers active at the time of focus.
+ ///
public bool Focus(
- IInputElement? control,
+ IInputElement? element,
NavigationMethod method = NavigationMethod.Unspecified,
KeyModifiers keyModifiers = KeyModifiers.None)
{
if (KeyboardDevice.Instance is not { } keyboardDevice)
return false;
- if (control is not null)
+ if (element is not null)
{
- if (!CanFocus(control))
+ if (!CanFocus(element))
return false;
- if (GetFocusScope(control) is StyledElement scope)
+ if (GetFocusScope(element) is StyledElement scope)
{
- scope.SetValue(FocusedElementProperty, control);
+ scope.SetValue(FocusedElementProperty, element);
_focusRoot = GetFocusRoot(scope);
}
- keyboardDevice.SetFocusedElement(control, method, keyModifiers);
+ keyboardDevice.SetFocusedElement(element, method, keyModifiers);
return true;
}
else if (_focusRoot?.GetValue(FocusedElementProperty) is { } restore &&
@@ -110,12 +101,7 @@ namespace Avalonia.Input
}
}
- public void ClearFocus()
- {
- Focus(null);
- }
-
- public void ClearFocusOnElementRemoved(IInputElement removedElement, Visual oldParent)
+ internal void ClearFocusOnElementRemoved(IInputElement removedElement, Visual oldParent)
{
if (oldParent is IInputElement parentElement &&
GetFocusScope(parentElement) is StyledElement scope &&
@@ -129,6 +115,7 @@ namespace Avalonia.Input
Focus(null);
}
+ [PrivateApi]
public IInputElement? GetFocusedElement(IFocusScope scope)
{
return (scope as StyledElement)?.GetValue(FocusedElementProperty);
@@ -138,6 +125,7 @@ namespace Avalonia.Input
/// Notifies the focus manager of a change in focus scope.
///
/// The new focus scope.
+ [PrivateApi]
public void SetFocusScope(IFocusScope scope)
{
if (GetFocusedElement(scope) is { } focused)
@@ -153,12 +141,14 @@ namespace Avalonia.Input
}
}
+ [PrivateApi]
public void RemoveFocusRoot(IFocusScope scope)
{
if (scope == _focusRoot)
- ClearFocus();
+ Focus(null);
}
+ [PrivateApi]
public static bool GetIsFocusScope(IInputElement e) => e is IFocusScope;
///
@@ -176,25 +166,15 @@ namespace Avalonia.Input
?? (FocusManager?)AvaloniaLocator.Current.GetService();
}
- ///
- /// Attempts to change focus from the element with focus to the next focusable element in the specified direction.
- ///
- /// The direction to traverse (in tab order).
- /// true if focus moved; otherwise, false.
- public bool TryMoveFocus(NavigationDirection direction)
+ ///
+ public bool TryMoveFocus(NavigationDirection direction, FindNextElementOptions? options = null)
{
- return FindAndSetNextFocus(direction, _xYFocusOptions);
- }
+ ValidateDirection(direction);
- ///
- /// Attempts to change focus from the element with focus to the next focusable element in the specified direction, using the specified navigation options.
- ///
- /// The direction to traverse (in tab order).
- /// The options to help identify the next element to receive focus with keyboard/controller/remote navigation.
- /// true if focus moved; otherwise, false.
- public bool TryMoveFocus(NavigationDirection direction, FindNextElementOptions options)
- {
- return FindAndSetNextFocus(direction, ValidateAndCreateFocusOptions(direction, options));
+ var focusOptions = ToFocusOptions(options, true);
+ var result = FindAndSetNextFocus(direction, focusOptions);
+ _reusableFocusOptions = focusOptions;
+ return result;
}
///
@@ -295,10 +275,7 @@ namespace Avalonia.Input
return true;
}
- ///
- /// Retrieves the first element that can receive focus.
- ///
- /// The first focusable element.
+ ///
public IInputElement? FindFirstFocusableElement()
{
var root = (_contentRoot as Visual)?.GetSelfAndVisualDescendants().FirstOrDefault(x => x is IInputElement) as IInputElement;
@@ -317,10 +294,7 @@ namespace Avalonia.Input
return GetFirstFocusableElement(searchScope);
}
- ///
- /// Retrieves the last element that can receive focus.
- ///
- /// The last focusable element.
+ ///
public IInputElement? FindLastFocusableElement()
{
var root = (_contentRoot as Visual)?.GetSelfAndVisualDescendants().FirstOrDefault(x => x is IInputElement) as IInputElement;
@@ -339,52 +313,59 @@ namespace Avalonia.Input
return GetFocusManager(searchScope)?.GetLastFocusableElement(searchScope);
}
- ///
- /// Retrieves the element that should receive focus based on the specified navigation direction.
- ///
- ///
- ///
- public IInputElement? FindNextElement(NavigationDirection direction)
+ ///
+ public IInputElement? FindNextElement(NavigationDirection direction, FindNextElementOptions? options = null)
{
- var xyOption = new XYFocusOptions()
- {
- UpdateManifold = false
- };
+ ValidateDirection(direction);
- return FindNextFocus(direction, xyOption);
+ var focusOptions = ToFocusOptions(options, false);
+ var result = FindNextFocus(direction, focusOptions);
+ _reusableFocusOptions = focusOptions;
+ return result;
}
- ///
- /// Retrieves the element that should receive focus based on the specified navigation direction (cannot be used with tab navigation).
- ///
- /// The direction that focus moves from element to element within the app UI.
- /// The options to help identify the next element to receive focus with the provided navigation.
- /// The next element to receive focus.
- public IInputElement? FindNextElement(NavigationDirection direction, FindNextElementOptions options)
+ private static void ValidateDirection(NavigationDirection direction)
{
- return FindNextFocus(direction, ValidateAndCreateFocusOptions(direction, options));
+ if (direction is not (
+ NavigationDirection.Next or
+ NavigationDirection.Previous or
+ NavigationDirection.Up or
+ NavigationDirection.Down or
+ NavigationDirection.Left or
+ NavigationDirection.Right))
+ {
+ throw new ArgumentOutOfRangeException(
+ nameof(direction),
+ direction,
+ $"Only {nameof(NavigationDirection.Next)}, {nameof(NavigationDirection.Previous)}, " +
+ $"{nameof(NavigationDirection.Up)}, {nameof(NavigationDirection.Down)}," +
+ $" {nameof(NavigationDirection.Left)} and {nameof(NavigationDirection.Right)} directions are supported");
+ }
}
- private static XYFocusOptions ValidateAndCreateFocusOptions(NavigationDirection direction, FindNextElementOptions options)
+ private XYFocusOptions ToFocusOptions(FindNextElementOptions? options, bool updateManifold)
{
- if (direction is not NavigationDirection.Up
- and not NavigationDirection.Down
- and not NavigationDirection.Left
- and not NavigationDirection.Right)
+ // XYFocus only uses the options and never modifies them; we can cache and reset them between calls.
+ var focusOptions = _reusableFocusOptions;
+ _reusableFocusOptions = null;
+
+ if (focusOptions is null)
+ focusOptions = new XYFocusOptions();
+ else
+ focusOptions.Reset();
+
+ if (options is not null)
{
- throw new ArgumentOutOfRangeException(nameof(direction),
- $"{direction} is not supported with FindNextElementOptions. Only Up, Down, Left and right are supported");
+ focusOptions.SearchRoot = options.SearchRoot;
+ focusOptions.ExclusionRect = options.ExclusionRect;
+ focusOptions.FocusHintRectangle = options.FocusHintRectangle;
+ focusOptions.NavigationStrategyOverride = options.NavigationStrategyOverride;
+ focusOptions.IgnoreOcclusivity = options.IgnoreOcclusivity;
}
- return new XYFocusOptions
- {
- UpdateManifold = false,
- SearchRoot = options.SearchRoot,
- ExclusionRect = options.ExclusionRect,
- FocusHintRectangle = options.FocusHintRectangle,
- NavigationStrategyOverride = options.NavigationStrategyOverride,
- IgnoreOcclusivity = options.IgnoreOcclusivity
- };
+ focusOptions.UpdateManifold = updateManifold;
+
+ return focusOptions;
}
internal IInputElement? FindNextFocus(NavigationDirection direction, XYFocusOptions focusOptions, bool updateManifolds = true)
diff --git a/src/Avalonia.Base/Input/GestureRecognizers/GestureRecognizerCollection.cs b/src/Avalonia.Base/Input/GestureRecognizers/GestureRecognizerCollection.cs
index 74e8061292..34e900c7d7 100644
--- a/src/Avalonia.Base/Input/GestureRecognizers/GestureRecognizerCollection.cs
+++ b/src/Avalonia.Base/Input/GestureRecognizers/GestureRecognizerCollection.cs
@@ -39,6 +39,24 @@ namespace Avalonia.Input.GestureRecognizers
}
}
+ public bool Remove(GestureRecognizer recognizer)
+ {
+ if (_recognizers == null)
+ return false;
+
+ var removed = _recognizers.Remove(recognizer);
+
+ if (removed)
+ {
+ recognizer.Target = null;
+
+ if (recognizer is ISetLogicalParent logical)
+ logical.SetParent(null);
+ }
+
+ return removed;
+ }
+
static readonly List s_Empty = new List();
public IEnumerator GetEnumerator()
diff --git a/src/Avalonia.Base/Input/GestureRecognizers/SwipeGestureRecognizer.cs b/src/Avalonia.Base/Input/GestureRecognizers/SwipeGestureRecognizer.cs
index 5d17940c8a..2328e5e874 100644
--- a/src/Avalonia.Base/Input/GestureRecognizers/SwipeGestureRecognizer.cs
+++ b/src/Avalonia.Base/Input/GestureRecognizers/SwipeGestureRecognizer.cs
@@ -1,87 +1,102 @@
using System;
-using Avalonia.Logging;
-using Avalonia.Media;
+using System.Diagnostics;
+using Avalonia.Platform;
namespace Avalonia.Input.GestureRecognizers
{
///
- /// A gesture recognizer that detects swipe gestures and raises
- /// on the target element when a swipe is confirmed.
+ /// A gesture recognizer that detects swipe gestures for paging interactions.
///
+ ///
+ /// Unlike , this recognizer is optimized for discrete
+ /// paging interactions (e.g., carousel navigation) rather than continuous scrolling.
+ /// It does not include inertia or friction physics.
+ ///
public class SwipeGestureRecognizer : GestureRecognizer
{
+ private bool _swiping;
+ private Point _trackedRootPoint;
private IPointer? _tracking;
- private IPointer? _captured;
- private Point _initialPosition;
- private int _gestureId;
+ private int _id;
+
+ private Vector _velocity;
+ private long _lastTimestamp;
///
- /// Defines the property.
+ /// Defines the property.
///
- public static readonly StyledProperty ThresholdProperty =
- AvaloniaProperty.Register(nameof(Threshold), 30d);
+ public static readonly StyledProperty CanHorizontallySwipeProperty =
+ AvaloniaProperty.Register(nameof(CanHorizontallySwipe));
///
- /// Defines the property.
+ /// Defines the property.
///
- public static readonly StyledProperty CrossAxisCancelThresholdProperty =
- AvaloniaProperty.Register(
- nameof(CrossAxisCancelThreshold), 8d);
+ public static readonly StyledProperty CanVerticallySwipeProperty =
+ AvaloniaProperty.Register(nameof(CanVerticallySwipe));
///
- /// Defines the property.
- /// Leading-edge start zone in px. 0 (default) = full area.
- /// When > 0, only starts tracking if the pointer is within this many px
- /// of the leading edge (LTR: left; RTL: right).
+ /// Defines the property.
///
- public static readonly StyledProperty EdgeSizeProperty =
- AvaloniaProperty.Register(nameof(EdgeSize), 0d);
+ ///
+ /// A value of 0 (the default) causes the distance to be read from
+ /// at the time of the first gesture.
+ ///
+ public static readonly StyledProperty ThresholdProperty =
+ AvaloniaProperty.Register(nameof(Threshold), defaultValue: 0d);
+
+ ///
+ /// Defines the property.
+ ///
+ public static readonly StyledProperty IsMouseEnabledProperty =
+ AvaloniaProperty.Register(nameof(IsMouseEnabled), defaultValue: false);
///
/// Defines the property.
- /// When false, the recognizer ignores all pointer events.
- /// Lets callers toggle the recognizer at runtime without needing to remove it from the
- /// collection (GestureRecognizerCollection has Add but no Remove).
- /// Default: true.
///
public static readonly StyledProperty IsEnabledProperty =
- AvaloniaProperty.Register(nameof(IsEnabled), true);
+ AvaloniaProperty.Register(nameof(IsEnabled), defaultValue: true);
///
- /// Gets or sets the minimum distance in pixels the pointer must travel before a swipe
- /// is recognized. Default is 30px.
+ /// Gets or sets a value indicating whether horizontal swipes are tracked.
///
- public double Threshold
+ public bool CanHorizontallySwipe
{
- get => GetValue(ThresholdProperty);
- set => SetValue(ThresholdProperty, value);
+ get => GetValue(CanHorizontallySwipeProperty);
+ set => SetValue(CanHorizontallySwipeProperty, value);
}
///
- /// Gets or sets the maximum cross-axis drift in pixels allowed before the gesture is
- /// cancelled. Default is 8px.
+ /// Gets or sets a value indicating whether vertical swipes are tracked.
///
- public double CrossAxisCancelThreshold
+ public bool CanVerticallySwipe
{
- get => GetValue(CrossAxisCancelThresholdProperty);
- set => SetValue(CrossAxisCancelThresholdProperty, value);
+ get => GetValue(CanVerticallySwipeProperty);
+ set => SetValue(CanVerticallySwipeProperty, value);
}
///
- /// Gets or sets the leading-edge start zone in pixels. When greater than zero, tracking
- /// only begins if the pointer is within this distance of the leading edge. Default is 0
- /// (full area).
+ /// Gets or sets the minimum pointer movement in pixels before a swipe is recognized.
+ /// A value of 0 reads the threshold from at gesture time.
///
- public double EdgeSize
+ public double Threshold
{
- get => GetValue(EdgeSizeProperty);
- set => SetValue(EdgeSizeProperty, value);
+ get => GetValue(ThresholdProperty);
+ set => SetValue(ThresholdProperty, value);
+ }
+
+ ///
+ /// Gets or sets a value indicating whether mouse pointer events trigger swipe gestures.
+ /// Defaults to ; touch and pen are always enabled.
+ ///
+ public bool IsMouseEnabled
+ {
+ get => GetValue(IsMouseEnabledProperty);
+ set => SetValue(IsMouseEnabledProperty, value);
}
///
- /// Gets or sets a value indicating whether the recognizer responds to pointer events.
- /// Setting this to false is a lightweight alternative to removing the recognizer from
- /// the collection. Default is true.
+ /// Gets or sets a value indicating whether this recognizer responds to pointer events.
+ /// Defaults to .
///
public bool IsEnabled
{
@@ -89,104 +104,122 @@ namespace Avalonia.Input.GestureRecognizers
set => SetValue(IsEnabledProperty, value);
}
+ ///
protected override void PointerPressed(PointerPressedEventArgs e)
{
- if (!IsEnabled) return;
- if (!e.GetCurrentPoint(null).Properties.IsLeftButtonPressed) return;
- if (Target is not Visual visual) return;
+ if (!IsEnabled)
+ return;
- var pos = e.GetPosition(visual);
- var edgeSize = EdgeSize;
+ var point = e.GetCurrentPoint(null);
- if (edgeSize > 0)
+ if ((e.Pointer.Type is PointerType.Touch or PointerType.Pen ||
+ (IsMouseEnabled && e.Pointer.Type == PointerType.Mouse))
+ && point.Properties.IsLeftButtonPressed)
{
- bool isRtl = visual.FlowDirection == FlowDirection.RightToLeft;
- bool inEdge = isRtl
- ? pos.X >= visual.Bounds.Width - edgeSize
- : pos.X <= edgeSize;
- if (!inEdge)
- {
- Logger.TryGet(LogEventLevel.Verbose, LogArea.Control)?.Log(
- this, "SwipeGestureRecognizer: press at {Pos} outside edge zone ({EdgeSize}px), ignoring",
- pos, edgeSize);
- return;
- }
+ EndGesture();
+ _tracking = e.Pointer;
+ _id = SwipeGestureEventArgs.GetNextFreeId();
+ _trackedRootPoint = point.Position;
+ _velocity = default;
+ _lastTimestamp = 0;
}
-
- _gestureId = SwipeGestureEventArgs.GetNextFreeId();
- _tracking = e.Pointer;
- _initialPosition = pos;
-
- Logger.TryGet(LogEventLevel.Verbose, LogArea.Control)?.Log(
- this, "SwipeGestureRecognizer: tracking started at {Pos} (pointer={PointerType})",
- pos, e.Pointer.Type);
}
+ ///
protected override void PointerMoved(PointerEventArgs e)
{
- if (_tracking != e.Pointer || Target is not Visual visual) return;
-
- var pos = e.GetPosition(visual);
- double dx = pos.X - _initialPosition.X;
- double dy = pos.Y - _initialPosition.Y;
- double absDx = Math.Abs(dx);
- double absDy = Math.Abs(dy);
- double threshold = Threshold;
-
- if (absDx < threshold && absDy < threshold)
- return;
-
- SwipeDirection dir;
- Vector delta;
- if (absDx >= absDy)
+ if (e.Pointer == _tracking)
{
- dir = dx > 0 ? SwipeDirection.Right : SwipeDirection.Left;
- delta = new Vector(dx, 0);
- }
- else
- {
- dir = dy > 0 ? SwipeDirection.Down : SwipeDirection.Up;
- delta = new Vector(0, dy);
- }
+ var rootPoint = e.GetPosition(null);
+ var threshold = GetEffectiveThreshold();
- Logger.TryGet(LogEventLevel.Verbose, LogArea.Control)?.Log(
- this, "SwipeGestureRecognizer: swipe recognized — direction={Direction}, delta={Delta}",
- dir, delta);
+ if (!_swiping)
+ {
+ var horizontalTriggered = CanHorizontallySwipe && Math.Abs(_trackedRootPoint.X - rootPoint.X) > threshold;
+ var verticalTriggered = CanVerticallySwipe && Math.Abs(_trackedRootPoint.Y - rootPoint.Y) > threshold;
+
+ if (horizontalTriggered || verticalTriggered)
+ {
+ _swiping = true;
+
+ _trackedRootPoint = new Point(
+ horizontalTriggered
+ ? _trackedRootPoint.X - (_trackedRootPoint.X >= rootPoint.X ? threshold : -threshold)
+ : rootPoint.X,
+ verticalTriggered
+ ? _trackedRootPoint.Y - (_trackedRootPoint.Y >= rootPoint.Y ? threshold : -threshold)
+ : rootPoint.Y);
+
+ Capture(e.Pointer);
+ }
+ }
- _tracking = null;
- _captured = e.Pointer;
- Capture(e.Pointer);
- e.Handled = true;
+ if (_swiping)
+ {
+ var delta = _trackedRootPoint - rootPoint;
+
+ var now = Stopwatch.GetTimestamp();
+ if (_lastTimestamp > 0)
+ {
+ var elapsedSeconds = (double)(now - _lastTimestamp) / Stopwatch.Frequency;
+ if (elapsedSeconds > 0)
+ {
+ var instantVelocity = delta / elapsedSeconds;
+ _velocity = _velocity * 0.5 + instantVelocity * 0.5;
+ }
+ }
+ _lastTimestamp = now;
+
+ Target!.RaiseEvent(new SwipeGestureEventArgs(_id, delta, _velocity));
+ _trackedRootPoint = rootPoint;
+ e.Handled = true;
+ }
+ }
+ }
- var args = new SwipeGestureEventArgs(_gestureId, dir, delta, _initialPosition);
- Target?.RaiseEvent(args);
+ ///
+ protected override void PointerCaptureLost(IPointer pointer)
+ {
+ if (pointer == _tracking)
+ EndGesture();
}
+ ///
protected override void PointerReleased(PointerReleasedEventArgs e)
{
- if (_tracking == e.Pointer)
+ if (e.Pointer == _tracking && _swiping)
{
- Logger.TryGet(LogEventLevel.Verbose, LogArea.Control)?.Log(
- this, "SwipeGestureRecognizer: pointer released without crossing threshold — gesture discarded");
- _tracking = null;
+ e.Handled = true;
+ EndGesture();
}
+ }
- if (_captured == e.Pointer)
+ private void EndGesture()
+ {
+ _tracking = null;
+ if (_swiping)
{
- (e.Pointer as Pointer)?.CaptureGestureRecognizer(null);
- _captured = null;
+ _swiping = false;
+ var endedArgs = new SwipeGestureEndedEventArgs(_id, _velocity);
+ _velocity = default;
+ _lastTimestamp = 0;
+ _id = 0;
+ Target!.RaiseEvent(endedArgs);
}
}
- protected override void PointerCaptureLost(IPointer pointer)
+ private const double DefaultTapSize = 10;
+
+ private double GetEffectiveThreshold()
{
- if (_tracking == pointer)
- {
- Logger.TryGet(LogEventLevel.Verbose, LogArea.Control)?.Log(
- this, "SwipeGestureRecognizer: capture lost — gesture cancelled");
- _tracking = null;
- }
- _captured = null;
+ var configured = Threshold;
+ if (configured > 0)
+ return configured;
+
+ var tapSize = AvaloniaLocator.Current?.GetService()
+ ?.GetTapSize(PointerType.Touch).Height ?? DefaultTapSize;
+
+ return tapSize / 2;
}
}
}
diff --git a/src/Avalonia.Base/Input/Gestures.cs b/src/Avalonia.Base/Input/Gestures.cs
index 3ae504a77f..07c9ab18be 100644
--- a/src/Avalonia.Base/Input/Gestures.cs
+++ b/src/Avalonia.Base/Input/Gestures.cs
@@ -30,14 +30,12 @@ namespace Avalonia.Input
private static readonly WeakReference s_lastPress = new WeakReference(null);
private static Point s_lastPressPoint;
private static CancellationTokenSource? s_holdCancellationToken;
-
static Gestures()
{
InputElement.PointerPressedEvent.RouteFinished.Subscribe(PointerPressed);
InputElement.PointerReleasedEvent.RouteFinished.Subscribe(PointerReleased);
InputElement.PointerMovedEvent.RouteFinished.Subscribe(PointerMoved);
}
-
private static object? GetCaptured(RoutedEventArgs? args)
{
if (args is not PointerEventArgs pointerEventArgs)
diff --git a/src/Avalonia.Base/Input/IFocusManager.cs b/src/Avalonia.Base/Input/IFocusManager.cs
index 5691172f3f..9bd1fb4239 100644
--- a/src/Avalonia.Base/Input/IFocusManager.cs
+++ b/src/Avalonia.Base/Input/IFocusManager.cs
@@ -14,9 +14,66 @@ namespace Avalonia.Input
IInputElement? GetFocusedElement();
///
- /// Clears currently focused element.
+ /// Focuses a control.
///
- [Unstable("This API might be removed in 11.x minor updates. Please consider focusing another element instead of removing focus at all for better UX.")]
- void ClearFocus();
+ /// The control to focus.
+ /// The method by which focus was changed.
+ /// Any key modifiers active at the time of focus.
+ /// true if the focus moved to a control; otherwise, false.
+ ///
+ /// If is null, this method tries to clear the focus. However, it is not advised.
+ /// For a better user experience, focus should be moved to another element when possible.
+ ///
+ /// When this method return true, it is not guaranteed that the focus has been moved
+ /// to . The focus might have been redirected to another element.
+ ///
+ bool Focus(
+ IInputElement? element,
+ NavigationMethod method = NavigationMethod.Unspecified,
+ KeyModifiers keyModifiers = KeyModifiers.None);
+
+ ///
+ /// Attempts to change focus from the element with focus to the next focusable element in the specified direction.
+ ///
+ ///
+ /// The direction that focus moves from element to element.
+ /// Must be one of , ,
+ /// , ,
+ /// and .
+ ///
+ ///
+ /// The options to help identify the next element to receive focus.
+ /// They only apply to directional navigation.
+ ///
+ /// true if focus moved; otherwise, false.
+ bool TryMoveFocus(NavigationDirection direction, FindNextElementOptions? options = null);
+
+ ///
+ /// Retrieves the first element that can receive focus.
+ ///
+ /// The first focusable element.
+ IInputElement? FindFirstFocusableElement();
+
+ ///
+ /// Retrieves the last element that can receive focus.
+ ///
+ /// The last focusable element.
+ IInputElement? FindLastFocusableElement();
+
+ ///
+ /// Retrieves the element that should receive focus based on the specified navigation direction.
+ ///
+ ///
+ /// The direction that focus moves from element to element.
+ /// Must be one of , ,
+ /// , ,
+ /// and .
+ ///
+ ///
+ /// The options to help identify the next element to receive focus.
+ /// They only apply to directional navigation.
+ ///
+ /// The next element to receive focus, if any.
+ IInputElement? FindNextElement(NavigationDirection direction, FindNextElementOptions? options = null);
}
}
diff --git a/src/Avalonia.Base/Input/InputElement.Gestures.cs b/src/Avalonia.Base/Input/InputElement.Gestures.cs
index 83f350f0e7..1323e4d35e 100644
--- a/src/Avalonia.Base/Input/InputElement.Gestures.cs
+++ b/src/Avalonia.Base/Input/InputElement.Gestures.cs
@@ -54,6 +54,13 @@ namespace Avalonia.Input
RoutedEvent.Register(
nameof(SwipeGesture), RoutingStrategies.Bubble);
+ ///
+ /// Defines the event.
+ ///
+ public static readonly RoutedEvent SwipeGestureEndedEvent =
+ RoutedEvent.Register(
+ nameof(SwipeGestureEnded), RoutingStrategies.Bubble);
+
///
/// Defines the event.
///
@@ -238,6 +245,15 @@ namespace Avalonia.Input
remove { RemoveHandler(SwipeGestureEvent, value); }
}
+ ///
+ /// Occurs when a swipe gesture ends on the control.
+ ///
+ public event EventHandler? SwipeGestureEnded
+ {
+ add { AddHandler(SwipeGestureEndedEvent, value); }
+ remove { RemoveHandler(SwipeGestureEndedEvent, value); }
+ }
+
///
/// Occurs when the user performs a rapid dragging motion in a single direction on a touchpad.
///
diff --git a/src/Avalonia.Base/Input/InputElement.cs b/src/Avalonia.Base/Input/InputElement.cs
index 1beccf341e..e908e818e8 100644
--- a/src/Avalonia.Base/Input/InputElement.cs
+++ b/src/Avalonia.Base/Input/InputElement.cs
@@ -523,7 +523,7 @@ namespace Avalonia.Input
if (!IsEffectivelyEnabled && FocusManager.GetFocusManager(this) is { } focusManager
&& Equals(focusManager.GetFocusedElement(), this))
{
- focusManager.ClearFocus();
+ focusManager.Focus(null);
}
}
}
@@ -995,7 +995,7 @@ namespace Avalonia.Input
}
else
{
- focusManager.ClearFocus();
+ focusManager.Focus(null);
}
}
}
diff --git a/src/Avalonia.Base/Input/Navigation/XYFocusOptions.cs b/src/Avalonia.Base/Input/Navigation/XYFocusOptions.cs
index 4bfcb22502..8e4c847aa9 100644
--- a/src/Avalonia.Base/Input/Navigation/XYFocusOptions.cs
+++ b/src/Avalonia.Base/Input/Navigation/XYFocusOptions.cs
@@ -1,17 +1,38 @@
namespace Avalonia.Input.Navigation;
-internal class XYFocusOptions
+internal sealed class XYFocusOptions
{
public InputElement? SearchRoot { get; set; }
public Rect ExclusionRect { get; set; }
public Rect? FocusHintRectangle { get; set; }
public Rect? FocusedElementBounds { get; set; }
public XYFocusNavigationStrategy? NavigationStrategyOverride { get; set; }
- public bool IgnoreClipping { get; set; } = true;
+ public bool IgnoreClipping { get; set; }
public bool IgnoreCone { get; set; }
public KeyDeviceType? KeyDeviceType { get; set; }
- public bool ConsiderEngagement { get; set; } = true;
- public bool UpdateManifold { get; set; } = true;
+ public bool ConsiderEngagement { get; set; }
+ public bool UpdateManifold { get; set; }
public bool UpdateManifoldsFromFocusHintRect { get; set; }
public bool IgnoreOcclusivity { get; set; }
+
+ public XYFocusOptions()
+ {
+ Reset();
+ }
+
+ internal void Reset()
+ {
+ SearchRoot = null;
+ ExclusionRect = default;
+ FocusHintRectangle = null;
+ FocusedElementBounds = null;
+ NavigationStrategyOverride = null;
+ IgnoreClipping = true;
+ IgnoreCone = false;
+ KeyDeviceType = null;
+ ConsiderEngagement = true;
+ UpdateManifold = true;
+ UpdateManifoldsFromFocusHintRect = false;
+ IgnoreOcclusivity = false;
+ }
}
diff --git a/src/Avalonia.Base/Input/SwipeDirection.cs b/src/Avalonia.Base/Input/SwipeDirection.cs
new file mode 100644
index 0000000000..3043b443e6
--- /dev/null
+++ b/src/Avalonia.Base/Input/SwipeDirection.cs
@@ -0,0 +1,28 @@
+namespace Avalonia.Input
+{
+ ///
+ /// Specifies the direction of a swipe gesture.
+ ///
+ public enum SwipeDirection
+ {
+ ///
+ /// The swipe moved to the left.
+ ///
+ Left,
+
+ ///
+ /// The swipe moved to the right.
+ ///
+ Right,
+
+ ///
+ /// The swipe moved upward.
+ ///
+ Up,
+
+ ///
+ /// The swipe moved downward.
+ ///
+ Down
+ }
+}
diff --git a/src/Avalonia.Base/Input/SwipeGestureEventArgs.cs b/src/Avalonia.Base/Input/SwipeGestureEventArgs.cs
index 0c2a91556a..3fa9aede82 100644
--- a/src/Avalonia.Base/Input/SwipeGestureEventArgs.cs
+++ b/src/Avalonia.Base/Input/SwipeGestureEventArgs.cs
@@ -1,50 +1,81 @@
+using System;
+using System.Threading;
using Avalonia.Interactivity;
namespace Avalonia.Input
{
///
- /// Specifies the direction of a swipe gesture.
- ///
- public enum SwipeDirection { Left, Right, Up, Down }
-
- ///
- /// Provides data for the routed event.
+ /// Provides data for swipe gesture events.
///
public class SwipeGestureEventArgs : RoutedEventArgs
{
- private static int _nextId = 1;
- internal static int GetNextFreeId() => _nextId++;
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ /// The unique identifier for this gesture.
+ /// The pixel delta since the last event.
+ /// The current swipe velocity in pixels per second.
+ public SwipeGestureEventArgs(int id, Vector delta, Vector velocity)
+ : base(InputElement.SwipeGestureEvent)
+ {
+ Id = id;
+ Delta = delta;
+ Velocity = velocity;
+ SwipeDirection = Math.Abs(delta.X) >= Math.Abs(delta.Y)
+ ? (delta.X <= 0 ? SwipeDirection.Right : SwipeDirection.Left)
+ : (delta.Y <= 0 ? SwipeDirection.Down : SwipeDirection.Up);
+ }
///
- /// Gets the unique identifier for this swipe gesture instance.
+ /// Gets the unique identifier for this gesture sequence.
///
public int Id { get; }
///
- /// Gets the direction of the swipe gesture.
+ /// Gets the pixel delta since the last event.
///
- public SwipeDirection SwipeDirection { get; }
+ public Vector Delta { get; }
///
- /// Gets the total translation vector of the swipe gesture.
+ /// Gets the current swipe velocity in pixels per second.
///
- public Vector Delta { get; }
+ public Vector Velocity { get; }
///
- /// Gets the position, relative to the target element, where the swipe started.
+ /// Gets the direction of the dominant swipe axis.
///
- public Point StartPoint { get; }
+ public SwipeDirection SwipeDirection { get; }
+
+ private static int s_nextId;
+ internal static int GetNextFreeId() => Interlocked.Increment(ref s_nextId);
+ }
+
+ ///
+ /// Provides data for the swipe gesture ended event.
+ ///
+ public class SwipeGestureEndedEventArgs : RoutedEventArgs
+ {
///
- /// Initializes a new instance of .
+ /// Initializes a new instance of the class.
///
- public SwipeGestureEventArgs(int id, SwipeDirection direction, Vector delta, Point startPoint)
- : base(InputElement.SwipeGestureEvent)
+ /// The unique identifier for this gesture.
+ /// The swipe velocity at release in pixels per second.
+ public SwipeGestureEndedEventArgs(int id, Vector velocity)
+ : base(InputElement.SwipeGestureEndedEvent)
{
Id = id;
- SwipeDirection = direction;
- Delta = delta;
- StartPoint = startPoint;
+ Velocity = velocity;
}
+
+ ///
+ /// Gets the unique identifier for this gesture sequence.
+ ///
+ public int Id { get; }
+
+ ///
+ /// Gets the swipe velocity at release in pixels per second.
+ ///
+ public Vector Velocity { get; }
}
}
diff --git a/src/Avalonia.Base/Layout/Layoutable.cs b/src/Avalonia.Base/Layout/Layoutable.cs
index fedea332b6..e0c316c60a 100644
--- a/src/Avalonia.Base/Layout/Layoutable.cs
+++ b/src/Avalonia.Base/Layout/Layoutable.cs
@@ -113,7 +113,7 @@ namespace Avalonia.Layout
/// Defines the property.
///
public static readonly StyledProperty MarginProperty =
- AvaloniaProperty.Register(nameof(Margin));
+ AvaloniaProperty.Register(nameof(Margin), validate: ValidateThickness);
///
/// Defines the property.
@@ -161,6 +161,8 @@ namespace Avalonia.Layout
private static bool ValidateMinimumDimension(double value) => !double.IsPositiveInfinity(value) && ValidateMaximumDimension(value);
private static bool ValidateMaximumDimension(double value) => value >= 0;
+ private static bool ValidateThickness(Thickness value) => double.IsFinite(value.Left) && double.IsFinite(value.Top) && double.IsFinite(value.Right) && double.IsFinite(value.Bottom);
+
///
/// Occurs when the element's effective viewport changes.
///
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual/ServerCompositionVisual.ComputedProperties.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual/ServerCompositionVisual.ComputedProperties.cs
index ed8860e04a..e2ce331318 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual/ServerCompositionVisual.ComputedProperties.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual/ServerCompositionVisual.ComputedProperties.cs
@@ -50,7 +50,7 @@ partial class ServerCompositionVisual
private LtrbRect? _ownClipRect;
- private bool _hasExtraDirtyRect;
+ private bool _needsToAddExtraDirtyRectToDirtyRegion;
private LtrbRect _extraDirtyRect;
public virtual LtrbRect? ComputeOwnContentBounds() => null;
@@ -107,7 +107,7 @@ partial class ServerCompositionVisual
_isDirtyForRender |= dirtyForRender;
// If node itself is dirty for render, we don't need to keep track of extra dirty rects
- _hasExtraDirtyRect = !dirtyForRender && (_hasExtraDirtyRect || additionalDirtyRegion);
+ _needsToAddExtraDirtyRectToDirtyRegion = !dirtyForRender && (_needsToAddExtraDirtyRectToDirtyRegion || additionalDirtyRegion);
}
public void RecomputeOwnProperties()
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual/ServerCompositionVisual.DirtyInputs.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual/ServerCompositionVisual.DirtyInputs.cs
index 8352fc70e2..35debea184 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual/ServerCompositionVisual.DirtyInputs.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual/ServerCompositionVisual.DirtyInputs.cs
@@ -166,7 +166,7 @@ partial class ServerCompositionVisual
protected void AddExtraDirtyRect(LtrbRect rect)
{
- _extraDirtyRect = _hasExtraDirtyRect ? _extraDirtyRect.Union(rect) : rect;
+ _extraDirtyRect = _delayPropagateHasExtraDirtyRects ? _extraDirtyRect.Union(rect) : rect;
_delayPropagateHasExtraDirtyRects = true;
EnqueueOwnPropertiesRecompute();
}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual/ServerCompositionVisual.Update.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual/ServerCompositionVisual.Update.cs
index b8322225bd..f9b65e01e0 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual/ServerCompositionVisual.Update.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual/ServerCompositionVisual.Update.cs
@@ -56,7 +56,7 @@ internal partial class ServerCompositionVisual
private bool NeedToPushBoundsAffectingProperties(ServerCompositionVisual node)
{
- return (node._isDirtyForRenderInSubgraph || node._hasExtraDirtyRect || node._contentChanged);
+ return (node._isDirtyForRenderInSubgraph || node._needsToAddExtraDirtyRectToDirtyRegion || node._contentChanged);
}
public void PreSubgraph(ServerCompositionVisual node, out bool visitChildren)
@@ -142,7 +142,7 @@ internal partial class ServerCompositionVisual
// specified before the tranform, i.e. in inner space, hence we have to pick them
// up before we pop the transform from the transform stack.
//
- if (node._hasExtraDirtyRect)
+ if (node._needsToAddExtraDirtyRectToDirtyRegion)
{
AddToDirtyRegion(node._extraDirtyRect);
}
@@ -169,7 +169,7 @@ internal partial class ServerCompositionVisual
node._isDirtyForRender = false;
node._isDirtyForRenderInSubgraph = false;
node._needsBoundingBoxUpdate = false;
- node._hasExtraDirtyRect = false;
+ node._needsToAddExtraDirtyRectToDirtyRegion = false;
node._contentChanged = false;
}
diff --git a/src/Avalonia.Controls/Border.cs b/src/Avalonia.Controls/Border.cs
index b816858632..29a31d8070 100644
--- a/src/Avalonia.Controls/Border.cs
+++ b/src/Avalonia.Controls/Border.cs
@@ -38,7 +38,7 @@ namespace Avalonia.Controls
/// Defines the property.
///
public static readonly StyledProperty BorderThicknessProperty =
- AvaloniaProperty.Register(nameof(BorderThickness));
+ AvaloniaProperty.Register(nameof(BorderThickness), validate: MarginProperty.ValidateValue);
///
/// Defines the property.
diff --git a/src/Avalonia.Controls/Carousel.cs b/src/Avalonia.Controls/Carousel.cs
index 533f7bb626..bf22671462 100644
--- a/src/Avalonia.Controls/Carousel.cs
+++ b/src/Avalonia.Controls/Carousel.cs
@@ -1,11 +1,13 @@
using Avalonia.Animation;
using Avalonia.Controls.Primitives;
using Avalonia.Controls.Templates;
+using Avalonia.Input;
namespace Avalonia.Controls
{
///
- /// An items control that displays its items as pages that fill the control.
+ /// An items control that displays its items as pages and can reveal adjacent pages
+ /// using .
///
public class Carousel : SelectingItemsControl
{
@@ -16,13 +18,36 @@ namespace Avalonia.Controls
AvaloniaProperty.Register(nameof(PageTransition));
///
- /// The default value of for
+ /// Defines the property.
+ ///
+ public static readonly StyledProperty IsSwipeEnabledProperty =
+ AvaloniaProperty.Register(nameof(IsSwipeEnabled), defaultValue: false);
+
+ ///
+ /// Defines the property.
+ ///
+ public static readonly StyledProperty ViewportFractionProperty =
+ AvaloniaProperty.Register(
+ nameof(ViewportFraction),
+ defaultValue: 1d,
+ coerce: (_, value) => double.IsFinite(value) && value > 0 ? value : 1d);
+
+ ///
+ /// Defines the property.
+ ///
+ public static readonly DirectProperty IsSwipingProperty =
+ AvaloniaProperty.RegisterDirect(nameof(IsSwiping),
+ o => o.IsSwiping);
+
+ ///
+ /// The default value of for
/// .
///
private static readonly FuncTemplate DefaultPanel =
new(() => new VirtualizingCarouselPanel());
private IScrollable? _scroller;
+ private bool _isSwiping;
///
/// Initializes static members of the class.
@@ -42,15 +67,51 @@ namespace Avalonia.Controls
set => SetValue(PageTransitionProperty, value);
}
+ ///
+ /// Gets or sets whether swipe gestures are enabled for navigating between pages.
+ /// When enabled, mouse pointer events are also accepted in addition to touch and pen.
+ ///
+ public bool IsSwipeEnabled
+ {
+ get => GetValue(IsSwipeEnabledProperty);
+ set => SetValue(IsSwipeEnabledProperty, value);
+ }
+
+ ///
+ /// Gets or sets the fraction of the viewport occupied by each page.
+ /// A value of 1 shows a single full page; values below 1 reveal adjacent pages.
+ ///
+ public double ViewportFraction
+ {
+ get => GetValue(ViewportFractionProperty);
+ set => SetValue(ViewportFractionProperty, value);
+ }
+
+ ///
+ /// Gets a value indicating whether a swipe gesture is currently in progress.
+ ///
+ public bool IsSwiping
+ {
+ get => _isSwiping;
+ internal set => SetAndRaise(IsSwipingProperty, ref _isSwiping, value);
+ }
+
///
/// Moves to the next item in the carousel.
///
public void Next()
{
+ if (ItemCount == 0)
+ return;
+
if (SelectedIndex < ItemCount - 1)
{
++SelectedIndex;
}
+ else if (WrapSelection)
+ {
+ SelectedIndex = 0;
+ }
}
///
@@ -58,18 +119,78 @@ namespace Avalonia.Controls
///
public void Previous()
{
+ if (ItemCount == 0)
+ return;
+
if (SelectedIndex > 0)
{
--SelectedIndex;
}
+ else if (WrapSelection)
+ {
+ SelectedIndex = ItemCount - 1;
+ }
+ }
+
+ internal PageSlide.SlideAxis? GetTransitionAxis()
+ {
+ var transition = PageTransition;
+
+ if (transition is CompositePageTransition composite)
+ {
+ foreach (var t in composite.PageTransitions)
+ {
+ if (t is PageSlide slide)
+ return slide.Orientation;
+ }
+
+ return null;
+ }
+
+ return transition is PageSlide ps ? ps.Orientation : null;
+ }
+
+ internal PageSlide.SlideAxis GetLayoutAxis() => GetTransitionAxis() ?? PageSlide.SlideAxis.Horizontal;
+
+ protected override void OnKeyDown(KeyEventArgs e)
+ {
+ base.OnKeyDown(e);
+
+ if (e.Handled || ItemCount == 0)
+ return;
+
+ var axis = ViewportFraction != 1d ? GetLayoutAxis() : GetTransitionAxis();
+ var isVertical = axis == PageSlide.SlideAxis.Vertical;
+ var isHorizontal = axis == PageSlide.SlideAxis.Horizontal;
+
+ switch (e.Key)
+ {
+ case Key.Left when !isVertical:
+ case Key.Up when !isHorizontal:
+ Previous();
+ e.Handled = true;
+ break;
+ case Key.Right when !isVertical:
+ case Key.Down when !isHorizontal:
+ Next();
+ e.Handled = true;
+ break;
+ case Key.Home:
+ SelectedIndex = 0;
+ e.Handled = true;
+ break;
+ case Key.End:
+ SelectedIndex = ItemCount - 1;
+ e.Handled = true;
+ break;
+ }
}
protected override Size ArrangeOverride(Size finalSize)
{
var result = base.ArrangeOverride(finalSize);
- if (_scroller is not null)
- _scroller.Offset = new(SelectedIndex, 0);
+ SyncScrollOffset();
return result;
}
@@ -84,11 +205,54 @@ namespace Avalonia.Controls
{
base.OnPropertyChanged(change);
- if (change.Property == SelectedIndexProperty && _scroller is not null)
+ if (change.Property == SelectedIndexProperty)
+ {
+ SyncScrollOffset();
+ }
+
+ if (change.Property == IsSwipeEnabledProperty ||
+ change.Property == PageTransitionProperty ||
+ change.Property == ViewportFractionProperty ||
+ change.Property == WrapSelectionProperty)
+ {
+ if (ItemsPanelRoot is VirtualizingCarouselPanel panel)
+ {
+ if (change.Property == ViewportFractionProperty && !panel.IsManagingInteractionOffset)
+ panel.SyncSelectionOffset(SelectedIndex);
+
+ panel.RefreshGestureRecognizer();
+ panel.InvalidateMeasure();
+ }
+
+ SyncScrollOffset();
+ }
+ }
+
+ private void SyncScrollOffset()
+ {
+ if (ItemsPanelRoot is VirtualizingCarouselPanel panel)
{
- var value = change.GetNewValue();
- _scroller.Offset = new(value, 0);
+ if (panel.IsManagingInteractionOffset)
+ return;
+
+ panel.SyncSelectionOffset(SelectedIndex);
+
+ if (ViewportFraction != 1d)
+ return;
}
+
+ if (_scroller is null)
+ return;
+
+ _scroller.Offset = CreateScrollOffset(SelectedIndex);
+ }
+
+ private Vector CreateScrollOffset(int index)
+ {
+ if (ViewportFraction != 1d && GetLayoutAxis() == PageSlide.SlideAxis.Vertical)
+ return new(0, index);
+
+ return new(index, 0);
}
}
}
diff --git a/src/Avalonia.Controls/Chrome/WindowDrawnDecorations.cs b/src/Avalonia.Controls/Chrome/WindowDrawnDecorations.cs
index ae279d6ab3..48847b5f59 100644
--- a/src/Avalonia.Controls/Chrome/WindowDrawnDecorations.cs
+++ b/src/Avalonia.Controls/Chrome/WindowDrawnDecorations.cs
@@ -58,13 +58,13 @@ public class WindowDrawnDecorations : StyledElement
/// Defines the property.
///
public static readonly StyledProperty DefaultFrameThicknessProperty =
- AvaloniaProperty.Register(nameof(DefaultFrameThickness));
+ AvaloniaProperty.Register(nameof(DefaultFrameThickness), validate: Border.BorderThicknessProperty.ValidateValue);
///
/// Defines the property.
///
public static readonly StyledProperty DefaultShadowThicknessProperty =
- AvaloniaProperty.Register(nameof(DefaultShadowThickness));
+ AvaloniaProperty.Register(nameof(DefaultShadowThickness), validate: Border.BorderThicknessProperty.ValidateValue);
///
/// Defines the property.
diff --git a/src/Avalonia.Controls/Decorator.cs b/src/Avalonia.Controls/Decorator.cs
index e62ca0000b..8cd1916718 100644
--- a/src/Avalonia.Controls/Decorator.cs
+++ b/src/Avalonia.Controls/Decorator.cs
@@ -20,7 +20,7 @@ namespace Avalonia.Controls
/// Defines the property.
///
public static readonly StyledProperty PaddingProperty =
- AvaloniaProperty.Register(nameof(Padding));
+ AvaloniaProperty.Register(nameof(Padding), validate: MarginProperty.ValidateValue);
///
/// Initializes static members of the class.
diff --git a/src/Avalonia.Controls/Embedding/EmbeddableControlRoot.cs b/src/Avalonia.Controls/Embedding/EmbeddableControlRoot.cs
index d4e5488019..59718c3e3f 100644
--- a/src/Avalonia.Controls/Embedding/EmbeddableControlRoot.cs
+++ b/src/Avalonia.Controls/Embedding/EmbeddableControlRoot.cs
@@ -4,6 +4,7 @@ using Avalonia.Automation.Peers;
using Avalonia.Controls.Automation;
using Avalonia.Controls.Automation.Peers;
using Avalonia.Controls.Platform;
+using Avalonia.Controls.Primitives;
using Avalonia.Input;
using Avalonia.Platform;
@@ -54,6 +55,12 @@ namespace Avalonia.Controls.Embedding
protected override Type StyleKeyOverride => typeof(EmbeddableControlRoot);
+ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+ {
+ base.OnApplyTemplate(e);
+ EnableVisualLayerManagerLayers();
+ }
+
protected override AutomationPeer OnCreateAutomationPeer()
{
return new EmbeddableControlRootAutomationPeer(this);
diff --git a/src/Avalonia.Controls/Page/DrawerPage.cs b/src/Avalonia.Controls/Page/DrawerPage.cs
index 814e533939..1392e98fbb 100644
--- a/src/Avalonia.Controls/Page/DrawerPage.cs
+++ b/src/Avalonia.Controls/Page/DrawerPage.cs
@@ -211,6 +211,7 @@ namespace Avalonia.Controls
private Border? _topBar;
private ToggleButton? _paneButton;
private Border? _backdrop;
+ private Point _swipeStartPoint;
private IDisposable? _navBarVisibleSub;
private const double EdgeGestureWidth = 20;
@@ -292,6 +293,8 @@ namespace Avalonia.Controls
public DrawerPage()
{
GestureRecognizers.Add(_swipeRecognizer);
+ AddHandler(PointerPressedEvent, OnSwipePointerPressed, handledEventsToo: true);
+ UpdateSwipeRecognizerAxes();
}
///
@@ -617,6 +620,7 @@ namespace Avalonia.Controls
}
else if (change.Property == DrawerPlacementProperty)
{
+ UpdateSwipeRecognizerAxes();
UpdatePanePlacement();
UpdateContentSafeAreaPadding();
}
@@ -664,6 +668,12 @@ namespace Avalonia.Controls
nav.SetDrawerPage(null);
}
+ private void UpdateSwipeRecognizerAxes()
+ {
+ _swipeRecognizer.CanVerticallySwipe = IsVerticalPlacement;
+ _swipeRecognizer.CanHorizontallySwipe = !IsVerticalPlacement;
+ }
+
protected override void OnLoaded(RoutedEventArgs e)
{
base.OnLoaded(e);
@@ -675,6 +685,11 @@ namespace Avalonia.Controls
}
}
+ private void OnSwipePointerPressed(object? sender, PointerPressedEventArgs e)
+ {
+ _swipeStartPoint = e.GetPosition(this);
+ }
+
protected override void OnKeyDown(KeyEventArgs e)
{
base.OnKeyDown(e);
@@ -714,8 +729,8 @@ namespace Avalonia.Controls
: EdgeGestureWidth;
bool inEdge = DrawerPlacement == DrawerPlacement.Bottom
- ? e.StartPoint.Y >= Bounds.Height - openGestureEdge
- : e.StartPoint.Y <= openGestureEdge;
+ ? _swipeStartPoint.Y >= Bounds.Height - openGestureEdge
+ : _swipeStartPoint.Y <= openGestureEdge;
if (towardPane && inEdge)
{
@@ -746,8 +761,8 @@ namespace Avalonia.Controls
: EdgeGestureWidth;
bool inEdge = IsPaneOnRight
- ? e.StartPoint.X >= Bounds.Width - openGestureEdge
- : e.StartPoint.X <= openGestureEdge;
+ ? _swipeStartPoint.X >= Bounds.Width - openGestureEdge
+ : _swipeStartPoint.X <= openGestureEdge;
if (towardPane && inEdge)
{
diff --git a/src/Avalonia.Controls/Page/NavigationPage.cs b/src/Avalonia.Controls/Page/NavigationPage.cs
index dd14d71a04..7f496ab10b 100644
--- a/src/Avalonia.Controls/Page/NavigationPage.cs
+++ b/src/Avalonia.Controls/Page/NavigationPage.cs
@@ -68,6 +68,8 @@ namespace Avalonia.Controls
private bool _isBackButtonEffectivelyEnabled;
private DrawerPage? _drawerPage;
private IPageTransition? _overrideTransition;
+ private Point _swipeStartPoint;
+ private int _lastSwipeGestureId;
private bool _hasOverrideTransition;
private readonly HashSet