Merge branch 'master' into fixes/invalidGlyphRunInkBounds

AvaloniaUI · Sep 12, 2024 · 92b46a5 · 92b46a5
2 parents 8618037 + ddf7238
commit 92b46a5
Show file tree

Hide file tree

Showing 216 changed files with 3,896 additions and 1,306 deletions.
diff --git a/api/Avalonia.Android.nupkg.xml b/api/Avalonia.Android.nupkg.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Android.AndroidViewControlHandle.get_HandleDescriptor</Target>
+    <Left>baseline/net8.0-android34.0/Avalonia.Android.dll</Left>
+    <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0007</DiagnosticId>
+    <Target>T:Avalonia.Android.AndroidViewControlHandle</Target>
+    <Left>baseline/net8.0-android34.0/Avalonia.Android.dll</Left>
+    <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
+  </Suppression>
+</Suppressions>
diff --git a/api/Avalonia.Browser.nupkg.xml b/api/Avalonia.Browser.nupkg.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Browser.JSObjectControlHandle.get_Handle</Target>
+    <Left>baseline/net8.0-browser1.0/Avalonia.Browser.dll</Left>
+    <Right>target/net8.0-browser1.0/Avalonia.Browser.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Browser.JSObjectControlHandle.get_HandleDescriptor</Target>
+    <Left>baseline/net8.0-browser1.0/Avalonia.Browser.dll</Left>
+    <Right>target/net8.0-browser1.0/Avalonia.Browser.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0007</DiagnosticId>
+    <Target>T:Avalonia.Browser.JSObjectControlHandle</Target>
+    <Left>baseline/net8.0-browser1.0/Avalonia.Browser.dll</Left>
+    <Right>target/net8.0-browser1.0/Avalonia.Browser.dll</Right>
+  </Suppression>
+</Suppressions>
diff --git a/api/Avalonia.FreeDesktop.nupkg.xml b/api/Avalonia.FreeDesktop.nupkg.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:Tmds.DBus.SourceGenerator.PropertyChanges`1</Target>
+    <Left>baseline/netstandard2.0/Avalonia.FreeDesktop.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.FreeDesktop.dll</Right>
+  </Suppression>
+</Suppressions>
diff --git a/api/Avalonia.Skia.nupkg.xml b/api/Avalonia.Skia.nupkg.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>CP0006</DiagnosticId>
+    <Target>M:Avalonia.Skia.ISkiaGpuWithPlatformGraphicsContext.TryGetGrContext</Target>
+    <Left>baseline/netstandard2.0/Avalonia.Skia.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Skia.dll</Right>
+  </Suppression>
+</Suppressions>
diff --git a/api/Avalonia.iOS.nupkg.xml b/api/Avalonia.iOS.nupkg.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.iOS.UIViewControlHandle.get_HandleDescriptor</Target>
+    <Left>baseline/net8.0-tvos17.0/Avalonia.iOS.dll</Left>
+    <Right>target/net8.0-tvos17.0/Avalonia.iOS.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0007</DiagnosticId>
+    <Target>T:Avalonia.iOS.UIViewControlHandle</Target>
+    <Left>baseline/net8.0-tvos17.0/Avalonia.iOS.dll</Left>
+    <Right>target/net8.0-tvos17.0/Avalonia.iOS.dll</Right>
+  </Suppression>
+</Suppressions>
diff --git a/api/Avalonia.nupkg.xml b/api/Avalonia.nupkg.xml
@@ -2,14 +2,20 @@
 <!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
 <Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Diagnostics.AppliedStyle</Target>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Diagnostics.AppliedStyle.get_HasActivator</Target>
     <Left>baseline/netstandard2.0/Avalonia.Base.dll</Left>
     <Right>target/netstandard2.0/Avalonia.Base.dll</Right>
   </Suppression>
   <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Diagnostics.StyleDiagnostics</Target>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Diagnostics.AppliedStyle.get_IsActive</Target>
+    <Left>baseline/netstandard2.0/Avalonia.Base.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Base.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Diagnostics.AppliedStyle.get_Style</Target>
     <Left>baseline/netstandard2.0/Avalonia.Base.dll</Left>
     <Right>target/netstandard2.0/Avalonia.Base.dll</Right>
   </Suppression>
@@ -19,6 +25,24 @@
     <Left>baseline/netstandard2.0/Avalonia.Base.dll</Left>
     <Right>target/netstandard2.0/Avalonia.Base.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Diagnostics.StyleDiagnostics.#ctor(System.Collections.Generic.IReadOnlyList{Avalonia.Diagnostics.AppliedStyle})</Target>
+    <Left>baseline/netstandard2.0/Avalonia.Base.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Base.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Diagnostics.StyleDiagnostics.get_AppliedStyles</Target>
+    <Left>baseline/netstandard2.0/Avalonia.Base.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Base.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Controls.Primitives.IPopupHost.ConfigurePosition(Avalonia.Visual,Avalonia.Controls.PlacementMode,Avalonia.Point,Avalonia.Controls.Primitives.PopupPositioning.PopupAnchor,Avalonia.Controls.Primitives.PopupPositioning.PopupGravity,Avalonia.Controls.Primitives.PopupPositioning.PopupPositionerConstraintAdjustment,System.Nullable{Avalonia.Rect})</Target>
+    <Left>baseline/netstandard2.0/Avalonia.Controls.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Controls.dll</Right>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Avalonia.Controls.Screens.#ctor(Avalonia.Platform.IScreenImpl)</Target>
@@ -43,6 +67,18 @@
     <Left>baseline/netstandard2.0/Avalonia.Controls.dll</Left>
     <Right>target/netstandard2.0/Avalonia.Controls.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0006</DiagnosticId>
+    <Target>M:Avalonia.Controls.Primitives.IPopupHost.ConfigurePosition(Avalonia.Controls.Primitives.PopupPositioning.PopupPositionRequest)</Target>
+    <Left>baseline/netstandard2.0/Avalonia.Controls.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Controls.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0009</DiagnosticId>
+    <Target>T:Avalonia.Diagnostics.StyleDiagnostics</Target>
+    <Left>baseline/netstandard2.0/Avalonia.Base.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Base.dll</Right>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0009</DiagnosticId>
     <Target>T:Avalonia.Controls.Screens</Target>

diff --git a/build/ImageSharp.props b/build/ImageSharp.props
@@ -1,5 +1,5 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.8" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.9" />
   </ItemGroup>
 </Project>
diff --git a/build/ReactiveUI.props b/build/ReactiveUI.props
@@ -1,5 +1,5 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="ReactiveUI" Version="18.3.1" />
+    <PackageReference Include="ReactiveUI" Version="20.1.1" />
   </ItemGroup>
 </Project>
diff --git a/build/Rx.props b/build/Rx.props
@@ -1,5 +1,5 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="System.Reactive" Version="5.0" />
+    <PackageReference Include="System.Reactive" Version="6.0.1" />
   </ItemGroup>
 </Project>
diff --git a/native/Avalonia.Native/src/OSX/AvnView.h b/native/Avalonia.Native/src/OSX/AvnView.h
@@ -18,6 +18,7 @@
 -(NSEvent* _Nonnull) lastMouseDownEvent;
 -(AvnPoint) translateLocalPoint:(AvnPoint)pt;
 -(void) onClosed;
+-(void) setModifiers:(NSEventModifierFlags)modifierFlags;
 
 -(AvnPlatformResizeReason) getResizeReason;
 -(void) setResizeReason:(AvnPlatformResizeReason)reason;

diff --git a/native/Avalonia.Native/src/OSX/AvnView.mm b/native/Avalonia.Native/src/OSX/AvnView.mm
@@ -480,6 +480,11 @@ - (void) keyboardEvent: (NSEvent *) event withType: (AvnRawKeyEventType)type
     _parent->TopLevelEvents->RawKeyEvent(type, timestamp, modifiers, key, physicalKey, keySymbolUtf8);
 }
 
+- (void)setModifiers:(NSEventModifierFlags)modifierFlags
+{
+    _modifierState = [self getModifiers:modifierFlags];
+}
+
 - (void)flagsChanged:(NSEvent *)event
 {
     auto newModifierState = [self getModifiers:[event modifierFlags]];

diff --git a/native/Avalonia.Native/src/OSX/AvnWindow.mm b/native/Avalonia.Native/src/OSX/AvnWindow.mm
@@ -298,7 +298,10 @@ - (void)windowDidBecomeKey:(NSNotification *_Nonnull)notification
 {
     if (_parent == nullptr)
         return;
-
+
+    if (_parent->View != nullptr)
+        [_parent->View setModifiers:NSEvent.modifierFlags];
+
     _parent->BringToFront();
 
     dispatch_async(dispatch_get_main_queue(), ^{

diff --git a/native/Avalonia.Native/src/OSX/automation.mm b/native/Avalonia.Native/src/OSX/automation.mm
@@ -13,7 +13,7 @@ @implementation AvnAccessibilityElement
     NSMutableArray* _children;
 }
 
-+ (id _Nullable)acquire:(IAvnAutomationPeer *)peer
++ (NSAccessibilityElement *)acquire:(IAvnAutomationPeer *)peer
 {
     if (peer == nullptr)
         return nil;
@@ -23,7 +23,12 @@ + (id _Nullable)acquire:(IAvnAutomationPeer *)peer
     if (instance != nullptr)
         return dynamic_cast<AvnAutomationNode*>(instance)->GetOwner();
 
-    if (peer->IsRootProvider())
+    if (peer->IsInteropPeer())
+    {
+        auto view = (__bridge NSAccessibilityElement*)peer->InteropPeer_GetNativeControlHandle();
+        return view;
+    }
+    else if (peer->IsRootProvider())
     {
         auto window = peer->RootProvider_GetWindow();
 
@@ -35,7 +40,7 @@ + (id _Nullable)acquire:(IAvnAutomationPeer *)peer
 
         auto holder = dynamic_cast<INSViewHolder*>(window);
         auto view = holder->GetNSView();
-        return [view window];
+        return (NSAccessibilityElement*)[view window];
     }
     else
     {

diff --git a/nukebuild/RefAssemblyGenerator.cs b/nukebuild/RefAssemblyGenerator.cs
@@ -84,6 +84,7 @@ static void ProcessType(TypeDefinition type, MethodReference obsoleteCtor)
             type.Methods.Add(new MethodDefinition(
                 "(This interface or abstract class is -not- implementable by user code !)",
                 MethodAttributes.Assembly
+                | MethodAttributes.Virtual
                 | MethodAttributes.Abstract
                 | MethodAttributes.NewSlot
                 | MethodAttributes.HideBySig, type.Module.TypeSystem.Void));

diff --git a/packages/Avalonia/AvaloniaBuildTasks.targets b/packages/Avalonia/AvaloniaBuildTasks.targets
@@ -160,7 +160,7 @@
       AnalyzerConfigFiles="@(EditorConfigFiles)"/>
   </Target>
 
-  <Target Name="InjectAvaloniaXamlOutput" DependsOnTargets="PrepareToCompileAvaloniaXaml" AfterTargets="CompileAvaloniaXaml" BeforeTargets="CopyFilesToOutputDirectory;BuiltProjectOutputGroup"
+  <Target Name="InjectAvaloniaXamlOutput" DependsOnTargets="PrepareToCompileAvaloniaXaml" AfterTargets="CompileAvaloniaXaml" BeforeTargets="CopyFilesToOutputDirectory;BuiltProjectOutputGroup;ComputeResolvedFilesToPublishList"
           Condition="'@(AvaloniaResource)@(AvaloniaXaml)' != '' AND $(EnableAvaloniaXamlCompilation) != false">
     <ItemGroup>
       <_AvaloniaXamlCompiledAssembly Include="@(IntermediateAssembly->Metadata('AvaloniaCompileOutput'))"/>

diff --git a/samples/ControlCatalog.Browser/wwwroot/main.js b/samples/ControlCatalog.Browser/wwwroot/main.js
@@ -4,8 +4,9 @@ const is_browser = typeof window != "undefined";
 if (!is_browser) throw new Error(`Expected to be running in a browser`);
 
 const dotnetRuntime = await dotnet
-    .withDiagnosticTracing(false)
     .withApplicationArgumentsFromQuery()
     .create();
 
-await dotnet.run();
+const config = dotnetRuntime.getConfig();
+
+await dotnetRuntime.runMain(config.mainAssemblyName, [globalThis.location.href]);
diff --git a/samples/ControlCatalog/Pages/FlyoutsPage.axaml b/samples/ControlCatalog/Pages/FlyoutsPage.axaml
@@ -222,7 +222,15 @@
                                 </Flyout>
                             </Button.Flyout>
                         </Button>
-
+                        <Button Content="Placement=Custom">
+                            <Button.Flyout>
+                                <Flyout Placement="Custom" CustomPopupPlacementCallback="CustomPlacementCallback">
+                                    <Panel Width="100" Height="100">
+                                        <TextBlock Text="Flyout Content!" />
+                                    </Panel>
+                                </Flyout>
+                            </Button.Flyout>
+                        </Button>
                     </UniformGrid>
                 </Border>
             </StackPanel>
@@ -267,7 +275,6 @@
                                 </Flyout>
                             </Button.Flyout>
                         </Button>
-
                     </WrapPanel>
                 </Border>
             </StackPanel>

diff --git a/samples/ControlCatalog/Pages/FlyoutsPage.axaml.cs b/samples/ControlCatalog/Pages/FlyoutsPage.axaml.cs
@@ -1,5 +1,8 @@
+using System;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Primitives.PopupPositioning;
 using Avalonia.Interactivity;
 
 namespace ControlCatalog.Pages
@@ -71,5 +74,25 @@ private void SetXamlTexts()
                 "Then attach the flyout where you want it:\n" +
                 "<Button Content=\"Launch Flyout here\" Flyout=\"{StaticResource SharedFlyout}\" />";
         }
+
+        public void CustomPlacementCallback(CustomPopupPlacement placement)
+        {
+            var r = new Random().Next();
+            placement.Anchor = (r % 4) switch
+            {
+                1 => PopupAnchor.Top,
+                2 => PopupAnchor.Left,
+                3 => PopupAnchor.Right,
+                _ => PopupAnchor.Bottom,
+            };
+            placement.Gravity = (r % 4) switch
+            {
+                1 => PopupGravity.Top,
+                2 => PopupGravity.Left,
+                3 => PopupGravity.Right,
+                _ => PopupGravity.Bottom,
+            };
+            placement.Offset = new Point(r % 20, r % 20);
+        }
     }
 }
diff --git a/samples/ControlCatalog/Pages/OpenGlPage.xaml b/samples/ControlCatalog/Pages/OpenGlPage.xaml
@@ -3,8 +3,11 @@
              x:Class="ControlCatalog.Pages.OpenGlPage"
              xmlns:pages="using:ControlCatalog.Pages"
              xmlns:openGl="clr-namespace:ControlCatalog.Pages.OpenGl">
-  <Grid>
+  <Grid x:Name="MainGrid">
     <pages:OpenGlPageControl x:Name="GL"/>
     <openGl:GlPageKnobs x:Name="Knobs" />
+    <Button x:Name="Snapshot"
+            IsVisible="False"
+            VerticalAlignment="Bottom" HorizontalAlignment="Right"  Click="SnapshotClick">Snapshot</Button>
   </Grid>
 </UserControl>
diff --git a/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs b/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs
@@ -1,8 +1,12 @@
+using System.Runtime.InteropServices;
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 using Avalonia.OpenGL;
 using Avalonia.OpenGL.Controls;
+using Avalonia.Rendering.Composition;
 using ControlCatalog.Pages.OpenGl;
 
 // ReSharper disable StringLiteralTypo
@@ -16,6 +20,30 @@ public OpenGlPage()
             AvaloniaXamlLoader.Load(this);
             this.FindControl<OpenGlPageControl>("GL")
                 !.Init(this.FindControl<GlPageKnobs>("Knobs")!);
+
+            AttachedToVisualTree += delegate
+            {
+                if (TopLevel.GetTopLevel(this) is Window)
+                    this.FindControl<Button>("Snapshot")!.IsVisible = true;
+            };
+        }
+
+        private async void SnapshotClick(object sender, RoutedEventArgs e)
+        {
+            var v = ElementComposition.GetElementVisual(this)!;
+            var snap = await v.Compositor.CreateCompositionVisualSnapshot(v, 1.5);
+            await new Window()
+            {
+                Content = new ScrollViewer()
+                {
+                    HorizontalScrollBarVisibility = ScrollBarVisibility.Auto,
+                    VerticalScrollBarVisibility = ScrollBarVisibility.Auto,
+                    Content = new Image()
+                    {
+                        Source = snap
+                    }
+                }
+            }.ShowDialog((Window)TopLevel.GetTopLevel(this));
         }
     }