Merge pull request #104 from wieslawsoltes/HeadlessTests

Headless tests

Author: wieslawsoltes

build/XUnit.props

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <PackageReference Include="Avalonia.Headless.XUnit" Version="11.3.0" />
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.abstractions" Version="2.0.3" />

src/PanAndZoom/ZoomBorder.cs

@@ -1,11 +1,12 @@
-using System;
+using System;
 using System.Diagnostics;
 using Avalonia.Controls.Metadata;
 using Avalonia.Input;
 using Avalonia.Input.GestureRecognizers;
 using Avalonia.Media;
 using Avalonia.Media.Transformation;
 using Avalonia.Reactive;
+using Avalonia.Styling;
 using static System.Math;
 
 namespace Avalonia.Controls.PanAndZoom;
@@ -86,7 +87,6 @@ public ZoomBorder()
 
         this.GetObservable(ChildProperty).Subscribe(new AnonymousObserver<Control?>(ChildChanged));
         this.GetObservable(BoundsProperty).Subscribe(new AnonymousObserver<Rect>(BoundsChanged));
-        Gestures.AddPointerTouchPadGestureMagnifyHandler(this, Border_Magnified);
 
         // Initialize gesture recognizers
         _pinchGestureRecognizer = new PinchGestureRecognizer();
@@ -96,12 +96,6 @@ public ZoomBorder()
             CanVerticallyScroll = true
         };
 
-        // Add gesture event handlers
-        AddHandler(Gestures.PinchEvent, Border_PinchGesture);
-        AddHandler(Gestures.PinchEndedEvent, Border_PinchGestureEnded);
-        AddHandler(Gestures.ScrollGestureEvent, Border_ScrollGesture);
-        AddHandler(Gestures.ScrollGestureEndedEvent, Border_ScrollGestureEnded);
-        
         // Add gesture recognizers based on EnableGestures flag
         UpdateGestureRecognizers();
 
@@ -141,12 +135,6 @@ private void UpdateGestureRecognizers()
                 CanVerticallyScroll = true
             };
 
-            // Re-add event handlers to new recognizers
-            AddHandler(Gestures.PinchEvent, Border_PinchGesture);
-            AddHandler(Gestures.PinchEndedEvent, Border_PinchGestureEnded);
-            AddHandler(Gestures.ScrollGestureEvent, Border_ScrollGesture);
-            AddHandler(Gestures.ScrollGestureEndedEvent, Border_ScrollGestureEnded);
-            
             _gestureRecognizersAdded = false;
         }
     }
@@ -195,6 +183,22 @@ private void PanAndZoom_AttachedToVisualTree(object? sender, VisualTreeAttachmen
         Log($"[AttachedToVisualTree] {Name}");
         ChildChanged(Child);
 
+        // Add pointer event handlers
+        PointerWheelChanged += Border_PointerWheelChanged;
+        PointerPressed += Border_PointerPressed;
+        PointerReleased += Border_PointerReleased;
+        PointerMoved += Border_PointerMoved;
+        PointerCaptureLost += Border_PointerCaptureLost;
+        
+        // Add gesture event handlers
+        AddHandler(Gestures.PinchEvent, Border_PinchGesture);
+        AddHandler(Gestures.PinchEndedEvent, Border_PinchGestureEnded);
+        AddHandler(Gestures.ScrollGestureEvent, Border_ScrollGesture);
+        AddHandler(Gestures.ScrollGestureEndedEvent, Border_ScrollGestureEnded);
+        
+        // Add touch pad gesture handler
+        Gestures.AddPointerTouchPadGestureMagnifyHandler(this, Border_Magnified);
+
         // Update gesture recognizers based on the new state
         UpdateGestureRecognizers();
 
@@ -207,6 +211,22 @@ private void PanAndZoom_DetachedFromVisualTree(object? sender, VisualTreeAttachm
     {
         Log($"[DetachedFromVisualTree] {Name}");
         DetachElement();
+        
+        // Remove pointer event handlers
+        PointerWheelChanged -= Border_PointerWheelChanged;
+        PointerPressed -= Border_PointerPressed;
+        PointerReleased -= Border_PointerReleased;
+        PointerMoved -= Border_PointerMoved;
+        PointerCaptureLost -= Border_PointerCaptureLost;
+        
+        // Remove gesture event handlers
+        RemoveHandler(Gestures.PinchEvent, Border_PinchGesture);
+        RemoveHandler(Gestures.PinchEndedEvent, Border_PinchGestureEnded);
+        RemoveHandler(Gestures.ScrollGestureEvent, Border_ScrollGesture);
+        RemoveHandler(Gestures.ScrollGestureEndedEvent, Border_ScrollGestureEnded);
+        
+        // Remove touch pad gesture handler
+        Gestures.RemovePointerTouchPadGestureMagnifyHandler(this, Border_Magnified);
     }
 
     private void Border_Magnified(object? sender, PointerDeltaEventArgs e)
@@ -218,7 +238,7 @@ private void Border_Magnified(object? sender, PointerDeltaEventArgs e)
 
     private void Border_PinchGesture(object? sender, PinchEventArgs e)
     {
-        if (!EnableGestureZoom || _element == null)
+        if (!EnableGestures || !EnableGestureZoom || _element == null)
             return;
 
         Log($"[PinchGesture] {Name} Scale: {e.Scale}");
@@ -235,13 +255,16 @@ private void Border_PinchGesture(object? sender, PinchEventArgs e)
 
     private void Border_PinchGestureEnded(object? sender, PinchEndedEventArgs e)
     {
+        if (!EnableGestures)
+            return;
+            
         Log($"[PinchGestureEnded] {Name}");
         e.Handled = true;
     }
 
     private void Border_ScrollGesture(object? sender, ScrollGestureEventArgs e)
     {
-        if (!EnableGestureTranslation)
+        if (!EnableGestureTranslation || _element == null)
             return;
 
         Log($"[ScrollGesture] {Name} Delta: {e.Delta}");
@@ -287,9 +310,10 @@ private void Border_PointerMoved(object? sender, PointerEventArgs e)
         Moved(e);
     }
 
-    private void Border_PointerCaptureLost(object sender, PointerCaptureLostEventArgs e)
+    private void Border_PointerCaptureLost(object? sender, PointerCaptureLostEventArgs e)
     {
         CaptureLost();
+        e.Handled = true;
     }
 
     private void Element_PropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
@@ -330,11 +354,6 @@ private void AttachElement(Control? element)
 
         _element = element;
         _element.PropertyChanged += Element_PropertyChanged;
-        PointerCaptureLost += Border_PointerCaptureLost;
-        PointerWheelChanged += Border_PointerWheelChanged;
-        PointerPressed += Border_PointerPressed;
-        PointerReleased += Border_PointerReleased;
-        PointerMoved += Border_PointerMoved;
 
     }
 
@@ -345,11 +364,6 @@ private void DetachElement()
             return;
         }
 
-        PointerCaptureLost -= Border_PointerCaptureLost;
-        PointerWheelChanged -= Border_PointerWheelChanged;
-        PointerPressed -= Border_PointerPressed;
-        PointerReleased -= Border_PointerReleased;
-        PointerMoved -= Border_PointerMoved;
         _element.PropertyChanged -= Element_PropertyChanged;
         _element.RenderTransform = null;
         _element = null;
@@ -378,7 +392,7 @@ private void Pressed(PointerPressedEventArgs e)
             BeginPanTo(point.X, point.Y);
             _captured = true;
             _isPanning = true;
-            SetPseudoClass(":isPanning", _isPanning);
+            ((IPseudoClasses)Classes).Set(":isPanning", _isPanning);
         }
     }
 
@@ -399,7 +413,7 @@ private void PanningFinished()
         }
         _captured = false;
         _isPanning = false;
-        SetPseudoClass(":isPanning", _isPanning);
+        ((IPseudoClasses)Classes).Set(":isPanning", _isPanning);
     }
 
     private void Moved(PointerEventArgs e)
@@ -975,5 +989,5 @@ public void AutoFit(bool skipTransitions = false)
         AutoFit(Bounds.Width, Bounds.Height, _element.Bounds.Width, _element.Bounds.Height, skipTransitions);
     }
 
-    private void SetPseudoClass(string name, bool flag) => PseudoClasses.Set(name, flag);
+
 }

tests/Avalonia.Controls.PanAndZoom.UnitTests/App.axaml

@@ -0,0 +1,7 @@
+<Application xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="Avalonia.Controls.PanAndZoom.UnitTests.App">
+  <Application.Styles>
+    <FluentTheme />
+  </Application.Styles>
+</Application>

tests/Avalonia.Controls.PanAndZoom.UnitTests/App.axaml.cs

@@ -0,0 +1,22 @@
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Markup.Xaml;
+
+namespace Avalonia.Controls.PanAndZoom.UnitTests;
+
+public class App : Application
+{
+    public override void Initialize()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+
+    public override void OnFrameworkInitializationCompleted()
+    {
+        if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime)
+        {
+            // This is for headless testing, no main window needed
+        }
+
+        base.OnFrameworkInitializationCompleted();
+    }
+}

tests/Avalonia.Controls.PanAndZoom.UnitTests/Avalonia.Controls.PanAndZoom.UnitTests.csproj

@@ -9,6 +9,7 @@
 
   <Import Project="..\..\build\Base.props" />
   <Import Project="..\..\build\Avalonia.props" />
+  <Import Project="..\..\build\Avalonia.Themes.Fluent.props" />
   <Import Project="..\..\build\XUnit.props" />
 
   <ItemGroup>

tests/Avalonia.Controls.PanAndZoom.UnitTests/TestAppBuilder.cs

@@ -0,0 +1,11 @@
+using Avalonia.Headless;
+
+[assembly: AvaloniaTestApplication(typeof(Avalonia.Controls.PanAndZoom.UnitTests.TestAppBuilder))]
+
+namespace Avalonia.Controls.PanAndZoom.UnitTests;
+
+public class TestAppBuilder
+{
+    public static AppBuilder BuildAvaloniaApp() => AppBuilder.Configure<App>()
+        .UseHeadless(new AvaloniaHeadlessPlatformOptions());
+}