Merge remote-tracking branch 'origin/feature/FormattedTextPort' into feature/FormattedTextPort

Author: Gillibald

azure-pipelines.yml

@@ -51,7 +51,7 @@ jobs:
     inputs:
       actions: 'build'
       scheme: ''
-      sdk: 'macosx11.0'
+      sdk: 'macosx11.1'
       configuration: 'Release'
       xcWorkspacePath: '**/*.xcodeproj/project.xcworkspace'
       xcodeVersion: '12' # Options: 8, 9, default, specifyPath

build/SharedVersion.props

@@ -21,6 +21,6 @@
   </PropertyGroup>
 
   <ItemGroup Label="PackageIcon">
-    <None Include="$(MSBuildThisFileDirectory)/Assets/Icon.png" Pack="true" PackagePath=""/>
+    <None Include="$(MSBuildThisFileDirectory)/Assets/Icon.png" Pack="true" Visible="false" PackagePath=""/>
   </ItemGroup>
 </Project>

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

@@ -111,7 +111,11 @@ -(void) dealloc
         if(_renderbuffer != 0)
             glDeleteRenderbuffers(1, &_renderbuffer);
     }
-    CFRelease(surface);
+
+    if(surface != nullptr)
+    {
+        CFRelease(surface);
+    }
 }
 @end
 
@@ -145,6 +149,12 @@ - (CALayer *)layer {
 }
 
 - (void)resize:(AvnPixelSize)size withScale: (float) scale{
+
+    if(size.Height <= 0)
+        size.Height = 1;
+    if(size.Width <= 0)
+        size.Width = 1;
+
     @synchronized (lock) {
         if(surface == nil
            || surface->size.Width != size.Width

src/Avalonia.Controls.DataGrid/DataGrid.cs

@@ -80,19 +80,24 @@ public static IEnumerable<Exception> UnpackException(Exception exception)
         {
             if (exception != null)
             {
-                var aggregate = exception as AggregateException;
-                var exceptions = aggregate == null ?
-                    (IEnumerable<Exception>)new[] { exception } :
-                    aggregate.InnerExceptions;
-                var filtered = exceptions.Where(x => !(x is BindingChainException)).ToList();
+                var exceptions = exception is AggregateException aggregate ?
+                    aggregate.InnerExceptions :
+                    (IEnumerable<Exception>)new[] { exception };
 
-                if (filtered.Count > 0)
-                {
-                    return filtered;
-                }
+                return exceptions.Where(x => !(x is BindingChainException)).ToList();
             }
 
-            return null;
+            return Array.Empty<Exception>();
+        }
+
+        public static object UnpackDataValidationException(Exception exception)
+        {
+            if (exception is DataValidationException dataValidationException)
+            {
+                return dataValidationException.ErrorData;
+            }
+
+            return exception;
         }
 
         /// <summary>

src/Avalonia.Controls.DataGrid/Utils/ValidationUtil.cs

@@ -246,7 +246,7 @@ protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T>
         /// <summary>
         /// Opens the menu.
         /// </summary>
-        public override void Open() => throw new NotSupportedException();
+        public override void Open() => Open(null);
 
         /// <summary>
         /// Opens a context menu on the specified control.

src/Avalonia.Controls/ContextMenu.cs

@@ -129,7 +129,7 @@ public void ClearRealizedRange(int realizedIndex, int count)
         {
             for (int i = 0; i < count; i++)
             {
-                // Clear from the edges so that ItemsRepeater can optimize on maintaining 
+                // Clear from the edges so that ItemsRepeater can optimize on maintaining
                 // realized indices without walking through all the children every time.
                 int index = realizedIndex == 0 ? realizedIndex + i : (realizedIndex + count - 1) - i;
                 var elementRef = _realizedElements[index];
@@ -212,7 +212,7 @@ public bool IsDataIndexRealized(int index)
         public ILayoutable GetRealizedElement(int dataIndex)
         {
             return IsVirtualizingContext ?
-                GetAt(GetRealizedRangeIndexFromDataIndex(dataIndex)) : 
+                GetAt(GetRealizedRangeIndexFromDataIndex(dataIndex)) :
                 _context.GetOrCreateElementAt(
                     dataIndex,
                     ElementRealizationOptions.ForceCreate | ElementRealizationOptions.SuppressAutoRecycle);
@@ -252,7 +252,6 @@ public bool IsWindowConnected(in Rect window, ScrollOrientation orientation, boo
                     (orientation == ScrollOrientation.Vertical ? ScrollOrientation.Horizontal : ScrollOrientation.Vertical) :
                     orientation;
 
-
                 var windowStart = effectiveOrientation == ScrollOrientation.Vertical ? window.Y : window.X;
                 var windowEnd = effectiveOrientation == ScrollOrientation.Vertical ? window.Y + window.Height : window.X + window.Width;
                 var firstElementStart = effectiveOrientation == ScrollOrientation.Vertical ? firstElementBounds.Y : firstElementBounds.X;
@@ -273,53 +272,53 @@ public void DataSourceChanged(object source, NotifyCollectionChangedEventArgs ar
                 switch (args.Action)
                 {
                     case NotifyCollectionChangedAction.Add:
-                    {
-                        OnItemsAdded(args.NewStartingIndex, args.NewItems.Count);
-                    }
-                    break;
+                        {
+                            OnItemsAdded(args.NewStartingIndex, args.NewItems.Count);
+                        }
+                        break;
 
                     case NotifyCollectionChangedAction.Replace:
-                    {
-                        int oldSize = args.OldItems.Count;
-                        int newSize = args.NewItems.Count;
-                        int oldStartIndex = args.OldStartingIndex;
-                        int newStartIndex = args.NewStartingIndex;
-
-                        if (oldSize == newSize &&
-                            oldStartIndex == newStartIndex &&
-                            IsDataIndexRealized(oldStartIndex) &&
-                            IsDataIndexRealized(oldStartIndex + oldSize -1))
                         {
-                            // Straight up replace of n items within the realization window.
-                            // Removing and adding might causes us to lose the anchor causing us
-                            // to throw away all containers and start from scratch.
-                            // Instead, we can just clear those items and set the element to
-                            // null (sentinel) and let the next measure get new containers for them.
-                            var startRealizedIndex = GetRealizedRangeIndexFromDataIndex(oldStartIndex);
-                            for (int realizedIndex = startRealizedIndex; realizedIndex < startRealizedIndex + oldSize; realizedIndex++)
+                            int oldSize = args.OldItems.Count;
+                            int newSize = args.NewItems.Count;
+                            int oldStartIndex = args.OldStartingIndex;
+                            int newStartIndex = args.NewStartingIndex;
+
+                            if (oldSize == newSize &&
+                                oldStartIndex == newStartIndex &&
+                                IsDataIndexRealized(oldStartIndex) &&
+                                IsDataIndexRealized(oldStartIndex + oldSize - 1))
                             {
-                                var elementRef = _realizedElements[realizedIndex];
-
-                                if (elementRef != null)
+                                // Straight up replace of n items within the realization window.
+                                // Removing and adding might causes us to lose the anchor causing us
+                                // to throw away all containers and start from scratch.
+                                // Instead, we can just clear those items and set the element to
+                                // null (sentinel) and let the next measure get new containers for them.
+                                var startRealizedIndex = GetRealizedRangeIndexFromDataIndex(oldStartIndex);
+                                for (int realizedIndex = startRealizedIndex; realizedIndex < startRealizedIndex + oldSize; realizedIndex++)
                                 {
-                                    _context.RecycleElement(elementRef);
-                                    _realizedElements[realizedIndex] = null;
+                                    var elementRef = _realizedElements[realizedIndex];
+
+                                    if (elementRef != null)
+                                    {
+                                        _context.RecycleElement(elementRef);
+                                        _realizedElements[realizedIndex] = null;
+                                    }
                                 }
                             }
+                            else
+                            {
+                                OnItemsRemoved(oldStartIndex, oldSize);
+                                OnItemsAdded(newStartIndex, newSize);
+                            }
                         }
-                        else
-                        {
-                            OnItemsRemoved(oldStartIndex, oldSize);
-                            OnItemsAdded(newStartIndex, newSize);
-                        }
-                    }
-                    break;
+                        break;
 
                     case NotifyCollectionChangedAction.Remove:
-                    {
-                        OnItemsRemoved(args.OldStartingIndex, args.OldItems.Count);
-                    }
-                    break;
+                        {
+                            OnItemsRemoved(args.OldStartingIndex, args.OldItems.Count);
+                        }
+                        break;
 
                     case NotifyCollectionChangedAction.Reset:
                         ClearRealizedRange();
@@ -376,7 +375,7 @@ private void DiscardElementsOutsideWindow(in Rect window, ScrollOrientation orie
             int backCutoffIndex = realizedRangeSize;
 
             for (int i = 0;
-                i<realizedRangeSize &&
+                i < realizedRangeSize &&
                 !Intersects(window, _realizedElementLayoutBounds[i], orientation);
                 ++i)
             {
@@ -391,7 +390,7 @@ private void DiscardElementsOutsideWindow(in Rect window, ScrollOrientation orie
                 --backCutoffIndex;
             }
 
-            if (backCutoffIndex<realizedRangeSize - 1)
+            if (backCutoffIndex < realizedRangeSize - 1)
             {
                 ClearRealizedRange(backCutoffIndex + 1, realizedRangeSize - backCutoffIndex - 1);
             }
@@ -419,14 +418,14 @@ private void OnItemsAdded(int index, int count)
             // to insert items.
             int lastRealizedDataIndex = _firstRealizedDataIndex + GetRealizedElementCount() - 1;
             int newStartingIndex = index;
-            if (newStartingIndex > _firstRealizedDataIndex &&
+            if (newStartingIndex >= _firstRealizedDataIndex &&
                 newStartingIndex <= lastRealizedDataIndex)
             {
                 // Inserted within the realized range
                 int insertRangeStartIndex = newStartingIndex - _firstRealizedDataIndex;
                 for (int i = 0; i < count; i++)
                 {
-                    // Insert null (sentinel) here instead of an element, that way we dont 
+                    // Insert null (sentinel) here instead of an element, that way we dont
                     // end up creating a lot of elements only to be thrown out in the next layout.
                     int insertRangeIndex = insertRangeStartIndex + i;
                     int dataIndex = newStartingIndex + i;

src/Avalonia.Layout/ElementManager.cs

@@ -108,7 +108,7 @@
     </Setter>
   </Style>
   <Style Selector="Expander /template/ ToggleButton#PART_toggle:pointerover /template/ Border">
-    <Setter Property="BorderBrush" Value="{DynamicResource SystemControlTransientBorderBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource SystemControlHighlightBaseMediumBrush}" />
   </Style>
   <Style Selector="Expander:down:expanded /template/ ToggleButton#PART_toggle /template/ Path">
     <Setter Property="RenderTransform">

src/Avalonia.Themes.Fluent/Controls/Expander.xaml

@@ -114,6 +114,8 @@ internal class X11Atoms
         public readonly IntPtr XA_WM_CLASS = (IntPtr)67;
         public readonly IntPtr XA_WM_TRANSIENT_FOR = (IntPtr)68;
 
+        public readonly IntPtr RR_PROPERTY_RANDR_EDID = (IntPtr)82;
+
         public readonly IntPtr WM_PROTOCOLS;
         public readonly IntPtr WM_DELETE_WINDOW;
         public readonly IntPtr WM_TAKE_FOCUS;