Merge branch 'main' into fix/parallels-vulkan-fallback

Author: orisson003

native/Avalonia.Native/src/OSX/AvnView.mm

@@ -80,7 +80,17 @@ -(AvnView*)  initWithParent: (TopLevelImpl*) parent
     [self setLayerContentsRedrawPolicy: NSViewLayerContentsRedrawDuringViewResize];
 
     _parent = parent;
-    _area = nullptr;
+
+    // NSTrackingInVisibleRect makes AppKit follow the visible bounds of the view.
+    // Because of this, the tracking area does not need to change on resize.
+    // Do not remove and add the area again on each live-resize tick.
+    // If you do, AppKit queues synthetic enter and exit events with stale locations.
+    // These events corrupt the pointer position after a resize and force it to the top left.
+    NSTrackingAreaOptions options = NSTrackingActiveAlways | NSTrackingMouseMoved |
+        NSTrackingMouseEnteredAndExited | NSTrackingEnabledDuringMouseDrag | NSTrackingInVisibleRect;
+    _area = [[NSTrackingArea alloc] initWithRect:NSZeroRect options:options owner:self userInfo:nullptr];
+    [self addTrackingArea:_area];
+
     _lastPixelSize.Height = 100;
     _lastPixelSize.Width = 100;
     [self registerForDraggedTypes: @[@"public.data", GetAvnCustomDataType()]];
@@ -128,25 +138,12 @@ -(void)setFrameSize:(NSSize)newSize
 {
     [super setFrameSize:newSize];
 
-    if(_area != nullptr)
-    {
-        [self removeTrackingArea:_area];
-        _area = nullptr;
-    }
-
     auto parent = _parent.tryGet();
     if (parent == nullptr)
     {
         return;
     }
 
-    NSRect rect = NSZeroRect;
-    rect.size = newSize;
-
-    NSTrackingAreaOptions options = NSTrackingActiveAlways | NSTrackingMouseMoved | NSTrackingMouseEnteredAndExited | NSTrackingEnabledDuringMouseDrag;
-    _area = [[NSTrackingArea alloc] initWithRect:rect options:options owner:self userInfo:nullptr];
-    [self addTrackingArea:_area];
-
     parent->UpdateCursor();
 
     auto fsize = [self convertSizeToBacking: [self frame].size];
@@ -258,8 +255,12 @@ - (void)mouseEvent:(NSEvent *)event withType:(AvnRawMouseEventType) type
         return;
     }
 
-    NSPoint eventLocation = [event locationInWindow];
-    
+    // AppKit synthesizes enter and exit events for the tracked geometry.
+    // They can have stale locations. Use the current pointer location instead.
+    NSPoint eventLocation = event.type == NSEventTypeMouseEntered || event.type == NSEventTypeMouseExited
+        ? [[self window] mouseLocationOutsideOfEventStream]
+        : [event locationInWindow];
+
     auto viewLocation = [self convertPoint:NSMakePoint(0, 0) toView:nil];
 
     auto localPoint = NSMakePoint(eventLocation.x - viewLocation.x, viewLocation.y - eventLocation.y);
@@ -392,7 +393,10 @@ - (void)mouseEvent:(NSEvent *)event withType:(AvnRawMouseEventType) type
         parent->TopLevelEvents->RawMouseEvent(type, pointerType, timestamp, modifiers, point, delta, pressure, xTilt, yTilt);
     }
 
-    [super mouseMoved:event];
+    // This handler is shared by all mouse event types. Only real mouse-moved
+    // events must continue up the responder chain as mouseMoved:
+    if (event.type == NSEventTypeMouseMoved)
+        [super mouseMoved:event];
 }
 
 - (BOOL) resignFirstResponder
@@ -560,7 +564,10 @@ - (void)swipeWithEvent:(NSEvent *)event
 
 - (void)mouseEntered:(NSEvent *)event
 {
-    [self mouseEvent:event withType:Move];
+    // If the pointer is not inside the view, the enter event is false. Ignore it.
+    NSPoint location = [self convertPoint:[[self window] mouseLocationOutsideOfEventStream] fromView:nil];
+    if (NSPointInRect(location, self.bounds))
+        [self mouseEvent:event withType:Move];
     [super mouseEntered:event];
 }
 

native/Avalonia.Native/src/OSX/AvnWindow.mm

@@ -348,6 +348,10 @@ - (void)windowDidResize:(NSNotification *_Nonnull)notification
 
 - (void)windowWillExitFullScreen:(NSNotification *_Nonnull)notification
 {
+    // Prepare the destination appearance before AppKit starts the exit animation.
+    if (_isExtended)
+        [self setTitlebarAppearsTransparent:true];
+
     auto parent = _parent.tryGetWithCast<IWindowStateChanged>();
 
     if(parent != nullptr)

samples/GpuInterop/VulkanDemo/VulkanSwapchain.cs

@@ -87,9 +87,7 @@ public void BeginDraw()
         var buffer = _vk.Pool.CreateCommandBuffer();
         buffer.BeginRecording();
 
-        _image.TransitionLayout(buffer.InternalHandle, 
-            ImageLayout.Undefined, AccessFlags.None,
-            ImageLayout.ColorAttachmentOptimal, AccessFlags.ColorAttachmentReadBit);
+        _image.TransitionLayout(buffer.InternalHandle, ImageLayout.ColorAttachmentOptimal, AccessFlags.ColorAttachmentReadBit);
 
         if(_image.IsDirectXBacked)
             buffer.Submit(null,null,null, null, new VulkanCommandBufferPool.VulkanCommandBuffer.KeyedMutexSubmitInfo
@@ -179,7 +177,11 @@ public void Present()
                 Format = RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? PlatformGraphicsExternalImageFormat.B8G8R8A8UNorm : PlatformGraphicsExternalImageFormat.R8G8B8A8UNorm,
                 Width = Size.Width,
                 Height = Size.Height,
-                MemorySize = _image.MemorySize
+                MemorySize = _image.MemorySize,
+                VulkanProperties = new PlatformGraphicsExternalImageVulkanProperties
+                {
+                    Layout = (int)ImageLayout.TransferSrcOptimal
+                }
             });
         if (_importedTimelineSemaphore != null)
         {

src/Android/Avalonia.Android/AvaloniaAccessHelper.cs

@@ -8,6 +8,7 @@
 using Avalonia.Automation;
 using Avalonia.Automation.Peers;
 using Avalonia.Automation.Provider;
+using Avalonia.Controls.Automation.Peers;
 using Java.Lang;
 
 namespace Avalonia.Android
@@ -84,6 +85,8 @@ public AvaloniaAccessHelper(AvaloniaView view) : base(view)
             }
         }
 
+        private static bool IsInteropPeer(AutomationPeer peer) => peer is InteropAutomationPeer;
+
         private HashSet<INodeInfoProvider> GetOrCreateNodeInfoProvidersFromPeer(AutomationPeer peer, out int virtualViewId)
         {
             int peerViewId;
@@ -175,6 +178,11 @@ protected override int GetVirtualViewAt(float x, float y)
             AutomationPeer? peer = embeddedRootProvider?.GetPeerFromPoint(p);
             if (peer is not null)
             {
+                if (IsInteropPeer(peer))
+                {
+                    return InvalidId;
+                }
+
                 int virtualViewId;
                 if (peer.GetParent() is AutomationPeer parent && 
                     !s_containerTypes.Contains(parent.GetAutomationControlType()))
@@ -191,7 +199,7 @@ protected override int GetVirtualViewAt(float x, float y)
             else
             {
                 peer = embeddedRootProvider?.GetFocus();
-                return peer is null ? InvalidId : _peerIds[peer];
+                return peer is null || IsInteropPeer(peer) ? InvalidId : _peerIds[peer];
             }
         }
 
@@ -204,6 +212,11 @@ protected override void GetVisibleVirtualViews(IList<Integer>? virtualViewIds)
 
             foreach (AutomationPeer peer in _peers[0].GetChildren())
             {
+                if (IsInteropPeer(peer))
+                {
+                    continue;
+                }
+
                 GetOrCreateNodeInfoProvidersFromPeer(peer, out int virtualViewId);
                 virtualViewIds.Add(Integer.ValueOf(virtualViewId));
             }
@@ -255,6 +268,11 @@ protected override void OnPopulateNodeForVirtualView(int virtualViewId, Accessib
             // UI logical structure
             foreach (AutomationPeer child in peer.GetChildren())
             {
+                if (IsInteropPeer(child))
+                {
+                    continue;
+                }
+
                 GetOrCreateNodeInfoProvidersFromPeer(child, out int childId);
                 nodeInfo.AddChild(_view, childId);
             }

src/Android/Avalonia.Android/Platform/Input/AndroidInputMethod.cs

@@ -174,11 +174,14 @@ public void SetOptions(TextInputOptions options)
 
                 outAttrs.InputType = options.ContentType switch
                 {
-                    TextInputContentType.Email => InputTypes.TextVariationEmailAddress,
-                    TextInputContentType.Number => InputTypes.ClassNumber,
-                    TextInputContentType.Password => InputTypes.TextVariationPassword,
+                    TextInputContentType.Email => InputTypes.ClassText | InputTypes.TextVariationEmailAddress,
+                    TextInputContentType.Number => InputTypes.ClassNumber | InputTypes.NumberFlagDecimal | InputTypes.NumberFlagSigned,
+                    TextInputContentType.Password => InputTypes.ClassText | InputTypes.TextVariationPassword,
+                    TextInputContentType.Pin => InputTypes.ClassNumber | InputTypes.NumberVariationPassword,
                     TextInputContentType.Digits => InputTypes.ClassPhone,
-                    TextInputContentType.Url => InputTypes.TextVariationUri,
+                    TextInputContentType.Url => InputTypes.ClassText | InputTypes.TextVariationUri,
+                    TextInputContentType.Name => InputTypes.ClassText | InputTypes.TextVariationPersonName,
+                    // Alpha/Normal/Social/Search have no dedicated Android keyboard
                     _ => InputTypes.ClassText
                 };
 
@@ -191,9 +194,6 @@ public void SetOptions(TextInputOptions options)
                 if (options.Multiline)
                     outAttrs.InputType |= InputTypes.TextFlagMultiLine;
 
-                if (outAttrs.InputType is InputTypes.ClassText && options.ShowSuggestions == false)
-                    outAttrs.InputType |= InputTypes.TextVariationPassword | InputTypes.TextFlagNoSuggestions;
-                    
                 outAttrs.ImeOptions = options.ReturnKeyType switch
                 {
                     TextInputReturnKeyType.Return => ImeFlags.NoEnterAction,
@@ -208,6 +208,23 @@ public void SetOptions(TextInputOptions options)
 
                 outAttrs.ImeOptions |= ImeFlags.NoFullscreen | ImeFlags.NoExtractUi;
 
+                if (options.ShowSuggestions == false &&
+                    (outAttrs.InputType & InputTypes.MaskClass) == InputTypes.ClassText)
+                {
+                    outAttrs.InputType |= InputTypes.TextFlagNoSuggestions;
+
+                    if ((outAttrs.InputType & InputTypes.MaskVariation) == InputTypes.TextVariationNormal)
+                        outAttrs.InputType |= InputTypes.TextVariationVisiblePassword;
+                }
+
+                if (options.IsSensitive)
+                {
+                    outAttrs.InputType |= InputTypes.TextFlagNoSuggestions;
+
+                    if (OperatingSystem.IsAndroidVersionAtLeast(26))
+                        outAttrs.ImeOptions |= ImeFlags.NoPersonalizedLearning;
+                }
+
                 if (options.LocaleHints?.Count > 0)
                     outAttrs.HintLocales = new LocaleList(options.LocaleHints.Select(Java.Util.Locale.ForLanguageTag).ToArray());
 

src/Avalonia.Base/Input/FocusManager.cs

@@ -80,7 +80,22 @@ public bool Focus(
 
             if (_focusRoot?.GetValue(FocusedElementProperty) is { } restore && restore != Current)
             {
-                return FocusCore(keyboardDevice, restore, method, keyModifiers);
+                if (!CanFocus(restore))
+                {
+                    // Previous effective focus is no longer part of the focus root's visual tree. We clear the focused element
+                    _focusRoot.ClearValue(FocusedElementProperty);
+
+                    if (Current != null && GetFocusScope(Current) != _focusRoot)
+                    {
+                        _focusRoot = null;
+
+                        return false;
+                    }
+                }
+                else
+                {
+                    return FocusCore(keyboardDevice, restore, method, keyModifiers);
+                }
             }
 
             _focusRoot = null;

src/Avalonia.Base/Input/InputElement.cs

@@ -568,8 +568,8 @@ protected override void OnDetachedFromVisualTreeCore(VisualTreeAttachmentEventAr
             if (IsFocused)
             {
                 var root = e.AttachmentPoint ?? e.RootVisual;
-                ((FocusManager?)e.PresentationSource.InputRoot.FocusManager)
-                    ?.ClearFocusOnElementRemoved(this, root);
+                (((FocusManager?)e.PresentationSource.InputRoot.FocusManager) ?? 
+                    FocusManager.GetFocusManager(this))?.ClearFocusOnElementRemoved(this, root);
             }
 
             IsKeyboardFocusWithin = false;

src/Avalonia.Base/Media/GlyphRun.cs

@@ -160,7 +160,10 @@ public double FontRenderingEmSize
         public Rect Bounds => new Rect(new Point(BaselineOrigin.X, 0),
             new Size(Metrics.WidthIncludingTrailingWhitespace, Metrics.Height));
 
-        public Rect InkBounds => PlatformImpl.Item.Bounds;
+        /// <summary>
+        ///     Gets the conservative bounding box of the inked area of the <see cref="GlyphRun"/>.
+        /// </summary>
+        public Rect InkBounds => _glyphInfos.Count == 0 ? default : PlatformImpl.Item.Bounds;
 
         /// <summary>
         /// 
@@ -246,6 +249,11 @@ public Geometry BuildGeometry()
         /// </returns>
         public double GetDistanceFromCharacterHit(CharacterHit characterHit)
         {
+            if (_glyphInfos.Count == 0)
+            {
+                return 0;
+            }
+
             var characterIndex = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
             var isTrailingHit = characterHit.TrailingLength > 0;
 
@@ -473,6 +481,11 @@ public CharacterHit GetPreviousCaretCharacterHit(CharacterHit characterHit)
         /// </returns>
         public int FindGlyphIndex(int characterIndex)
         {
+            if (_glyphInfos.Count == 0)
+            {
+                return 0;
+            }
+
             if (_hasOneCharPerCluster)
             {
                 return characterIndex;
@@ -559,6 +572,14 @@ public CharacterHit FindNearestCharacterHit(int index, out double width)
         {
             width = 0.0;
 
+            // A run can hold characters and no glyphs at all - a line break in a font that gives the
+            // shaper no way to hide it shapes to nothing. There is no cluster to snap to, and the
+            // whole run sits at one position, so treat it as a single zero-width cluster.
+            if (_glyphInfos.Count == 0)
+            {
+                return new CharacterHit(Metrics.FirstCluster, _characters.Length);
+            }
+
             var glyphIndex = FindGlyphIndex(index);
 
             if (_hasOneCharPerCluster)

src/Avalonia.Base/Media/TextFormatting/TextFormatterImpl.cs

@@ -541,7 +541,12 @@ private static void ShapeTogether(IReadOnlyList<UnshapedTextRun> textRuns, ReadO
 
                 var splitResult = shapedBuffer.Split(previousLength + currentRun.Length);
 
-                if (splitResult.First is null || splitResult.First.Length == 0)
+                // Split by text, not by glyph count: a run can legitimately shape to no glyphs at
+                // all and still own its characters. Shapers drop default ignorables that the font
+                // cannot hide behind a space glyph, so a run holding nothing but a line break can
+                // come back empty. Skipping it there would delete its characters from the line and
+                // leave the caller stuck at the same text position.
+                if (splitResult.First is null || splitResult.First.Text.Length == 0)
                 {
                     previousLength += currentRun.Length;
                 }

src/Avalonia.Base/Platform/PlatformGraphicsExternalMemory.cs

@@ -8,6 +8,19 @@ public record struct PlatformGraphicsExternalImageProperties
     public ulong MemorySize { get; set; }
     public ulong MemoryOffset { get; set; }
     public bool TopLeftOrigin { get; set; }
+
+    /// <summary>
+    /// Vulkan-specific properties of the imported image, ignored by other backends.
+    /// </summary>
+    public PlatformGraphicsExternalImageVulkanProperties? VulkanProperties { get; set; }
+}
+
+public record struct PlatformGraphicsExternalImageVulkanProperties
+{
+    /// <summary>
+    /// The VkImageLayout the underlying memory is currently in.
+    /// </summary>
+    public int Layout { get; set; }
 }
 
 public enum PlatformGraphicsExternalImageFormat