Upgrade Avalonia to 11.2.1

Directory.Build.props

@@ -12,6 +12,6 @@
         <NoWarn>AVA3001</NoWarn>
     </PropertyGroup>
     <PropertyGroup>
-        <AvaloniaVersion>11.0.9</AvaloniaVersion>
+        <AvaloniaVersion>11.2.1</AvaloniaVersion>
     </PropertyGroup>
 </Project>

src/Consolonia.Core/Consolonia.Core.csproj

@@ -9,8 +9,7 @@
 
     <ItemGroup>
         <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.FreeDesktop" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Skia" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)" />
         <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
         <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.8" />

src/Consolonia.Core/Controls/MessageBox.axaml.cs

@@ -43,19 +43,29 @@
 
             InitializeComponent();
 
-            AttachedToVisualTree += (_, _) =>
-            {
-                // we don't hook this up until the dialog is shown as the visible state is driven off of the DataContext
-                // which is set at ShowDialogAsync() time. 
-                if (OkButton.IsVisible)
-                    OkButton.AttachedToVisualTree += (_, _) => OkButton.Focus();
-                else if (YesButton.IsVisible)
-                    YesButton.AttachedToVisualTree += (_, _) => YesButton.Focus();
-                else if (CancelButton.IsVisible)
-                    CancelButton.AttachedToVisualTree += (_, _) => CancelButton.Focus();
-                else if (NoButton.IsVisible)
-                    NoButton.AttachedToVisualTree += (_, _) => NoButton.Focus();
-            };
+            AttachedToVisualTree += OnShowDialog;
+        }
+
+        private void OnShowDialog(object sender, VisualTreeAttachmentEventArgs e)
+        {
+            // we don't hook this up until the dialog is shown as the visible state is driven off of the DataContext
+            // which is set at ShowDialogAsync() time. 
+            AttachedToVisualTree -= OnShowDialog;
+            if (OkButton.IsVisible)
+                OkButton.AttachedToVisualTree += ButtonAttached;
+            else if (YesButton.IsVisible)
+                YesButton.AttachedToVisualTree += ButtonAttached;
+            else if (CancelButton.IsVisible)
+                CancelButton.AttachedToVisualTree += ButtonAttached;
+            else if (NoButton.IsVisible)
+                NoButton.AttachedToVisualTree += ButtonAttached;
+        }
+
+        private void ButtonAttached(object sender, VisualTreeAttachmentEventArgs e)
+        {
+            var button = (Button)sender;
+            button.AttachedToVisualTree -= ButtonAttached;
+            button.Focus();
         }
 
         public Mode Mode
@@ -93,7 +103,7 @@
             DataContext = new MessageBoxViewModel(Mode, Ok, Cancel, Yes, No, text, title ?? Title);
 #nullable enable
             var result = await ShowDialogAsync<MessageBoxResult?>(parent);
             if (result.HasValue) return result.Value;
             return MessageBoxResult.Cancel;
 #nullable disable
         }

src/Consolonia.Core/Drawing/ConsoleBrush.cs

@@ -126,10 +126,16 @@ public static ConsoleBrush FromPosition(IBrush brush, int x, int y, int width, i
                     // Calculate the distance from the center
                     double dx = x - centerX;
                     double dy = y - centerY;
-                    double distance = Math.Sqrt(dx * dx + dy * dy);
 
-                    // Normalize the distance based on the brush radius
-                    double normalizedDistance = distance / (Math.Min(width, height) * radialBrush.Radius);
+                    // Calculate the distance based on separate X and Y radii
+                    double distanceX = dx / (width * radialBrush.RadiusX.Scalar);
+                    double distanceY = dy / (height * radialBrush.RadiusY.Scalar);
+                    double distance = Math.Sqrt(distanceX * distanceX + distanceY * distanceY);
+
+                    // Normalize the distance
+                    double normalizedDistance = distance /
+                                                Math.Sqrt(radialBrush.RadiusX.Scalar * radialBrush.RadiusX.Scalar +
+                                                          radialBrush.RadiusY.Scalar * radialBrush.RadiusY.Scalar);
 
                     // Clamp the normalized distance to [0, 1]
                     normalizedDistance = Math.Min(Math.Max(normalizedDistance, 0), 1);

src/Consolonia.Core/Drawing/ConsoloniaPlatformRenderInterfaceContext.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Avalonia;
 using Avalonia.Platform;
 
 namespace Consolonia.Core.Drawing
@@ -20,6 +21,13 @@ public IRenderTarget CreateRenderTarget(IEnumerable<object> surfaces)
             return new RenderTarget(surfaces);
         }
 
+        public IDrawingContextLayerImpl CreateOffscreenRenderTarget(PixelSize pixelSize, double scaling)
+        {
+            throw new NotImplementedException();
+        }
+
         public bool IsLost => false;
+
+        public IReadOnlyDictionary<Type, object> PublicFeatures => new Dictionary<Type, object>();
     }
 }

src/Consolonia.Core/Drawing/ConsoloniaRenderInterface.cs

@@ -176,10 +176,17 @@ public bool IsSupportedBitmapPixelFormat(PixelFormat format)
             throw new NotImplementedException();
         }
 
+        public IPlatformRenderInterfaceRegion CreateRegion()
+        {
+            throw new NotImplementedException();
+        }
+
         public bool SupportsIndividualRoundRects => false;
 
         public AlphaFormat DefaultAlphaFormat => throw new NotImplementedException();
 
         public PixelFormat DefaultPixelFormat => throw new NotImplementedException();
+
+        public bool SupportsRegions => false;
     }
 }

src/Consolonia.Core/Drawing/DrawingContextImpl.cs

@@ -39,10 +39,13 @@
             _consoleWindow = consoleWindow;
             _pixelBuffer = pixelBuffer;
             _clipStack.Push(pixelBuffer.Size);
+            RenderOptions = new RenderOptions();
         }
 
         private Rect CurrentClip => _clipStack.Peek();
 
+        public RenderOptions RenderOptions { get; set; }
+
         public void Dispose()
         {
         }
@@ -215,7 +218,7 @@
             DrawStringInternal(foreground, text, glyphRun.GlyphTypeface);
         }
 
-        public IDrawingContextLayerImpl CreateLayer(Size size)
+        public IDrawingContextLayerImpl CreateLayer(PixelSize size)
         {
             return new RenderTarget(_consoleWindow);
         }
@@ -234,6 +237,11 @@
             PushClip(clip.Rect);
         }
 
+        public void PushClip(IPlatformRenderInterfaceRegion region)
+        {
+            throw new NotImplementedException();
+        }
+
         public void PopClip()
         {
             _clipStack.Pop();
@@ -286,14 +294,27 @@
             throw new NotImplementedException();
         }
 
-        public RenderOptions RenderOptions { get; set; }
-
         public Matrix Transform
         {
             get => _transform;
             set => _transform = value * _postTransform;
         }
 
+        public void DrawRegion(IBrush brush, IPen pen, IPlatformRenderInterfaceRegion region)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void PushLayer(Rect bounds)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void PopLayer()
+        {
+            throw new NotImplementedException();
+        }
+
         /// <summary>
         ///     Draw a straight horizontal line or vertical line
         /// </summary>

src/Consolonia.Core/Drawing/Line.cs

@@ -92,6 +92,11 @@ public bool TryGetSegment(double startDistance, double stopDistance, bool startO
         public IGeometryImpl SourceGeometry { get; }
         public Matrix Transform { get; }
 
+        public IGeometryImpl GetWidenedGeometry(IPen pen)
+        {
+            throw new NotImplementedException();
+        }
+
         public static Line CreateMyLine(Point p1, Point p2)
         {
             (double x, double y) = p2 - p1;

src/Consolonia.Core/Drawing/Rectangle.cs

@@ -67,6 +67,11 @@ public bool TryGetSegment(double startDistance, double stopDistance, bool startO
             throw new NotImplementedException();
         }
 
+        public IGeometryImpl GetWidenedGeometry(IPen pen)
+        {
+            throw new NotImplementedException();
+        }
+
         public Rect Bounds => _rect;
         public double ContourLength => (_rect.Width + _rect.Height) * 2;
         public IGeometryImpl SourceGeometry { get; }

src/Consolonia.Core/Drawing/RenderTarget.cs

@@ -69,8 +69,10 @@ void IDrawingContextLayerImpl.Blit(IDrawingContextImpl context)
 
         bool IDrawingContextLayerImpl.CanBlit => true;
 
-        public IDrawingContextImpl CreateDrawingContext()
+        public IDrawingContextImpl CreateDrawingContext(bool useScaledDrawing)
         {
+            if (useScaledDrawing)
+                throw new NotImplementedException($"Consolonia doesn't support useScaledDrawing");
             return new DrawingContextImpl(_consoleWindow, _bufferBuffer);
         }
 

src/Consolonia.Core/Infrastructure/ArrowsAndKeyboardNavigationHandler.cs

@@ -15,9 +15,9 @@
         //todo: check XTFocus https://github.com/jinek/Consolonia/issues/105#issuecomment-2089015880
         private IInputRoot _owner;
 
-        public ArrowsAndKeyboardNavigationHandler(IKeyboardNavigationHandler keyboardNavigationHandler)
+        public ArrowsAndKeyboardNavigationHandler()
         {
-            _keyboardNavigationHandler = keyboardNavigationHandler;
+            _keyboardNavigationHandler = new KeyboardNavigationHandler();
         }
 
         public void SetOwner(IInputRoot owner)

src/Consolonia.Core/Infrastructure/ConsoleWindow.cs

@@ -6,9 +6,10 @@
 using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.Platform;
 using Avalonia.Input;
+using Avalonia.Input.Platform;
 using Avalonia.Input.Raw;
-using Avalonia.Input.TextInput;
 using Avalonia.Platform;
 using Avalonia.Platform.Storage;
 using Avalonia.Rendering.Composition;
@@ -77,12 +78,21 @@ public IPopupImpl CreatePopup()
 
         public void SetTransparencyLevelHint(IReadOnlyList<WindowTransparencyLevel> transparencyLevels)
         {
-            throw new NotImplementedException("Consider this");
+            Debug.WriteLine($"ConsoleWindow.SetTransparencyLevelHint({transparencyLevels}) called, not implemented");
         }
 
         public void SetFrameThemeVariant(PlatformThemeVariant themeVariant)
         {
-            //todo:
+            //todo: Light or dark
+            switch (themeVariant)
+            {
+                case PlatformThemeVariant.Dark:
+                    Debug.WriteLine($"ConsoleWindow.SetFrameThemeVariant({themeVariant}) called, not implemented");
+                    break;
+                case PlatformThemeVariant.Light:
+                    Debug.WriteLine($"ConsoleWindow.SetFrameThemeVariant({themeVariant}) called, not implemented");
+                    break;
+            }
         }
 
         public Size ClientSize
@@ -135,7 +145,8 @@ public void Activate()
 
         public void SetTopmost(bool value)
         {
-            throw new NotImplementedException();
+            // todo
+            Debug.WriteLine($"ConsoleWindow.SetTopmost({value}) called, not implemented");
         }
 
         public double DesktopScaling => 1d;
@@ -153,7 +164,6 @@ public void SetTopmost(bool value)
         public Size MaxAutoSizeHint { get; }
 
         // ReSharper disable once UnassignedGetOnlyAutoProperty todo: what is this property
-        public IScreenImpl Screen => null!;
 
         public void SetTitle(string title)
         {
@@ -185,7 +195,7 @@ public void ShowTaskbarIcon(bool value)
 
         public void CanResize(bool value)
         {
-            throw new NotImplementedException();
+            // todo, enable/dsiable resizing of window
         }
 
         public void BeginMoveDrag(PointerPressedEventArgs e)
@@ -211,22 +221,22 @@ public void Move(PixelPoint point)
 
         public void SetMinMaxSize(Size minSize, Size maxSize)
         {
-            throw new NotImplementedException();
+            //throw new NotImplementedException();
         }
 
         public void SetExtendClientAreaToDecorationsHint(bool extendIntoClientAreaHint)
         {
-            throw new NotImplementedException();
+            // we don't support this, we can ignore
         }
 
         public void SetExtendClientAreaChromeHints(ExtendClientAreaChromeHints hints)
         {
-            throw new NotImplementedException();
+            // we don't support this, we can ignore
         }
 
         public void SetExtendClientAreaTitleBarHeightHint(double titleBarHeight)
         {
-            throw new NotImplementedException();
+            // we don't support this, we can ignore
         }
 
         public WindowState WindowState { get; set; }
@@ -249,12 +259,31 @@ public void SetExtendClientAreaTitleBarHeightHint(double titleBarHeight)
 
         public object TryGetFeature(Type featureType)
         {
-            if (featureType == typeof(ISystemNavigationManagerImpl))
-                return null;
-            if (featureType == typeof(ITextInputMethodImpl)) return null;
             if (featureType == typeof(IStorageProvider))
                 return AvaloniaLocator.Current.GetService<IStorageProvider>();
-            throw new NotImplementedException("Consider this");
+
+            if (featureType == typeof(IInsetsManager))
+                // IInsetsManager doesn't apply to console applications.
+                return null;
+
+            if (featureType == typeof(IClipboard))
+            {
+                var clipboard = AvaloniaLocator.CurrentMutable.GetService<IClipboard>();
+                if (clipboard != null)
+                    return clipboard;
+            }
+
+            // TODO ISystemNavigationManagerImpl should be implemented to handle BACK navigation between pages of controls like mobile apps do.
+            // TODO ITextInputMethodImplshould be implemented to handle text IME input
+            Debug.WriteLine($"Missing Feature: {featureType.Name} is not implemented but someone is asking for it!");
+            return null;
+        }
+
+        public void GetWindowsZOrder(Span<Window> windows, Span<long> zOrder)
+        {
+            // In console mode, all windows are considered to be at the same z-order level
+            for (int i = 0; i < zOrder.Length; i++)
+                zOrder[i] = 0;
         }
 
         private void ConsoleOnMouseEvent(RawPointerEventType type, Point point, Vector? wheelDelta,

src/Consolonia.Core/Infrastructure/ConsoloniaApplication.cs

@@ -8,9 +8,9 @@ public class ConsoloniaApplication : Application
         public override void RegisterServices()
         {
             base.RegisterServices();
-            var keyboardNavigationHandler = AvaloniaLocator.Current.GetRequiredService<IKeyboardNavigationHandler>();
+
             AvaloniaLocator.CurrentMutable.Bind<IKeyboardNavigationHandler>()
-                .ToConstant(new ArrowsAndKeyboardNavigationHandler(keyboardNavigationHandler));
+                .ToTransient<ArrowsAndKeyboardNavigationHandler>();
         }
     }
 }