Merge branch 'master' into pinvoke-for-static-linking

src/Avalonia.Controls.DataGrid/DataGridColumn.cs

@@ -38,7 +38,7 @@ namespace Avalonia.Controls
         private ICellEditBinding _editBinding;
         private IBinding _clipboardContentBinding;
         private ControlTheme _cellTheme;
-        private readonly Classes _cellStyleClasses = new Classes();
+        private Classes _cellStyleClasses;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="T:Avalonia.Controls.DataGridColumn" /> class.
@@ -393,17 +393,7 @@ namespace Avalonia.Controls
             }
         }
 
-        public Classes CellStyleClasses
-        {
-            get => _cellStyleClasses;
-            set
-            {
-                if(_cellStyleClasses != value)
-                {
-                    _cellStyleClasses.Replace(value);
-                }
-            }
-        }
+        public Classes CellStyleClasses => _cellStyleClasses ??= new();
 
         /// <summary>
         ///    Backing field for CellTheme property.

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

@@ -42,9 +42,10 @@
 
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
-    
+
     <x:Double x:Key="ListAccentLowOpacity">0.6</x:Double>
     <x:Double x:Key="ListAccentMediumOpacity">0.8</x:Double>
+    <x:Double x:Key="DataGridSortIconMinWidth">32</x:Double>
 
     <StreamGeometry x:Key="DataGridSortIconDescendingPath">M1875 1011l-787 787v-1798h-128v1798l-787 -787l-90 90l941 941l941 -941z</StreamGeometry>
     <StreamGeometry x:Key="DataGridSortIconAscendingPath">M1965 947l-941 -941l-941 941l90 90l787 -787v1798h128v-1798l787 787z</StreamGeometry>
@@ -174,7 +175,7 @@
                     VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
                 <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="*" />
-                  <ColumnDefinition Width="Auto" MinWidth="32" />
+                  <ColumnDefinition Width="Auto" MinWidth="{DynamicResource DataGridSortIconMinWidth}" />
                 </Grid.ColumnDefinitions>
 
                 <ContentPresenter Content="{TemplateBinding Content}"
@@ -512,7 +513,7 @@
                   BorderBrush="{TemplateBinding BorderBrush}"
                   BorderThickness="{TemplateBinding BorderThickness}"
                   CornerRadius="{TemplateBinding CornerRadius}">
-            <Grid ColumnDefinitions="Auto,*,Auto" 
+            <Grid ColumnDefinitions="Auto,*,Auto"
                   RowDefinitions="Auto,*,Auto,Auto"
                   ClipToBounds="True">
               <DataGridColumnHeader Name="PART_TopLeftCornerHeader"

src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs

@@ -7,7 +7,7 @@ using Avalonia.Input.GestureRecognizers;
 using Avalonia.Utilities;
 using Avalonia.VisualTree;
 using System.Linq;
-using Avalonia.Interactivity;
+using Avalonia.Layout;
 
 namespace Avalonia.Controls.Presenters
 {
@@ -473,7 +473,15 @@ namespace Avalonia.Controls.Presenters
             }
 
             Viewport = finalSize;
-            Extent = Child!.Bounds.Size.Inflate(Child.Margin);
+
+            var childMargin = Child!.Margin;
+            if (Child.UseLayoutRounding)
+            {
+                var scale = LayoutHelper.GetLayoutScale(Child);
+                childMargin = LayoutHelper.RoundLayoutThickness(childMargin, scale, scale);
+            }
+
+            Extent = Child!.Bounds.Size.Inflate(childMargin);
             _isAnchorElementDirty = true;
 
             return finalSize;

src/Avalonia.Themes.Fluent/DensityStyles/Compact.xaml

@@ -1,22 +1,25 @@
-<Styles xmlns="https://github.com/avaloniaui" 
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:ClassModifier="internal">
-    <Style Selector="TextBlock" >
-        <Setter Property="FontSize" Value="14" />
-    </Style>
-    <Styles.Resources>
-      <x:Double x:Key="ControlContentThemeFontSize">14</x:Double>
-      <x:Double x:Key="ContentControlFontSize">14</x:Double>
-      <x:Double x:Key="TextControlThemeMinHeight">24</x:Double>
-      <Thickness x:Key="TextControlThemePadding">2,2,6,1</Thickness>
-      <x:Double x:Key="ListViewItemMinHeight">32</x:Double>
-      <x:Double x:Key="TreeViewItemMinHeight">24</x:Double>
-      <Thickness x:Key="TimePickerHostPadding">0,1,0,2</Thickness>
-      <Thickness x:Key="DatePickerHostPadding">0,1,0,2</Thickness>
-      <Thickness x:Key="DatePickerHostMonthPadding">9,0,0,1</Thickness>
-      <Thickness x:Key="ComboBoxEditableTextPadding">10,0,30,0</Thickness>
-      <x:Double x:Key="ComboBoxMinHeight">24</x:Double>
-      <Thickness x:Key="ComboBoxPadding">12,1,0,3</Thickness>
-      <x:Double x:Key="NavigationViewItemOnLeftMinHeight">32</x:Double>
-    </Styles.Resources>
-</Styles>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    x:ClassModifier="internal">
+  <x:Double x:Key="ControlContentThemeFontSize">14</x:Double>
+  <x:Double x:Key="ContentControlFontSize">14</x:Double>
+  <x:Double x:Key="TextControlThemeMinHeight">24</x:Double>
+  <x:Double x:Key="TextControlThemeMinWidth">32</x:Double>
+  <Thickness x:Key="TextControlThemePadding">4, 2</Thickness>
+  <Thickness x:Key="ListBoxItemPadding">4,2</Thickness>
+  <x:Double x:Key="ListViewItemMinHeight">24</x:Double>
+  <Thickness x:Key="ComboBoxItemThemePadding">11,5,11,7</Thickness>
+  <Thickness x:Key="MenuFlyoutItemThemePaddingNarrow">4 4 8 4</Thickness>
+  <Thickness x:Key="MenuBarItemPadding">5, 2</Thickness>
+  <x:Double x:Key="TreeViewItemMinHeight">24</x:Double>
+  <Thickness x:Key="TimePickerHostPadding">0,1,0,2</Thickness>
+  <Thickness x:Key="DatePickerHostPadding">0,1,0,2</Thickness>
+  <Thickness x:Key="DatePickerHostMonthPadding">9,0,0,1</Thickness>
+  <Thickness x:Key="ComboBoxEditableTextPadding">10,0,30,0</Thickness>
+  <x:Double x:Key="ComboBoxMinHeight">24</x:Double>
+  <Thickness x:Key="ComboBoxPadding">12,1,0,3</Thickness>
+  <x:Double x:Key="NavigationViewItemOnLeftMinHeight">32</x:Double>
+  <x:Double x:Key="TabItemMinHeight">28</x:Double>
+  <Thickness x:Key="TabItemHeaderMargin">6, 0</Thickness>
+  <Thickness x:Key="ButtonPadding">6,4</Thickness>
+</ResourceDictionary>

src/Avalonia.Themes.Fluent/FluentTheme.xaml

@@ -18,7 +18,7 @@
       </ResourceDictionary.MergedDictionaries>
       
       <!-- These are not part of MergedDictionaries so we can add or remove them easier -->
-      <StyleInclude x:Key="CompactStyles" Source="/DensityStyles/Compact.xaml" />
+      <ResourceInclude x:Key="CompactStyles" Source="/DensityStyles/Compact.xaml" />
     </ResourceDictionary>
   </Styles.Resources>
   

src/Avalonia.Themes.Fluent/FluentTheme.xaml.cs

@@ -16,9 +16,10 @@ namespace Avalonia.Themes.Fluent
     /// <summary>
     /// Includes the fluent theme in an application.
     /// </summary>
-    public class FluentTheme : Styles
+    public class FluentTheme : Styles, IResourceNode
     {
-        private readonly Styles _compactStyles;
+        private readonly ResourceDictionary _compactStyles;
+        private DensityStyle _densityStyle;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="FluentTheme"/> class.
@@ -28,9 +29,7 @@ namespace Avalonia.Themes.Fluent
         {
             AvaloniaXamlLoader.Load(sp, this);
             
-            _compactStyles = (Styles)GetAndRemove("CompactStyles");
-
-            EnsureCompactStyles();
+            _compactStyles = (ResourceDictionary)GetAndRemove("CompactStyles");
 
             Palettes = Resources.MergedDictionaries.OfType<ColorPaletteResourcesCollection>().FirstOrDefault()
                 ?? throw new InvalidOperationException("FluentTheme was initialized with missing ColorPaletteResourcesCollection.");
@@ -43,17 +42,17 @@ namespace Avalonia.Themes.Fluent
                 return val;
             }
         }
-        
-        public static readonly StyledProperty<DensityStyle> DensityStyleProperty =
-            AvaloniaProperty.Register<FluentTheme, DensityStyle>(nameof(DensityStyle));
+
+        public static readonly DirectProperty<FluentTheme, DensityStyle> DensityStyleProperty = AvaloniaProperty.RegisterDirect<FluentTheme, DensityStyle>(
+            nameof(DensityStyle), o => o.DensityStyle, (o, v) => o.DensityStyle = v);
 
         /// <summary>
         /// Gets or sets the density style of the fluent theme (normal, compact).
         /// </summary>
         public DensityStyle DensityStyle
         {
-            get => GetValue(DensityStyleProperty);
-            set => SetValue(DensityStyleProperty, value);
+            get => _densityStyle;
+            set => SetAndRaise(DensityStyleProperty, ref _densityStyle, value);
         }
         
         public IDictionary<ThemeVariant, ColorPaletteResources> Palettes { get; }
@@ -64,20 +63,20 @@ namespace Avalonia.Themes.Fluent
 
             if (change.Property == DensityStyleProperty)
             {
-                EnsureCompactStyles();
+                Owner?.NotifyHostedResourcesChanged(ResourcesChangedEventArgs.Empty);
             }
         }
 
-        private void EnsureCompactStyles()
+        bool IResourceNode.TryGetResource(object key, ThemeVariant? theme, out object? value)
         {
-            if (DensityStyle == DensityStyle.Compact)
+            // DensityStyle dictionary should be checked first
+            if (_densityStyle == DensityStyle.Compact
+                && _compactStyles.TryGetResource(key, theme, out value))
             {
-                Add(_compactStyles);
-            }
-            else
-            {
-                Remove(_compactStyles);
+                return true;
             }
+
+            return base.TryGetResource(key, theme, out value);
         }
     }
 }

src/Avalonia.X11/X11Clipboard.cs

@@ -224,7 +224,7 @@ namespace Avalonia.X11
 
         private Task<object> SendDataRequest(IntPtr format)
         {
-            if (_requestedDataTcs == null || _requestedFormatsTcs.Task.IsCompleted)
+            if (_requestedDataTcs == null || _requestedDataTcs.Task.IsCompleted)
                 _requestedDataTcs = new TaskCompletionSource<object>();
             XConvertSelection(_x11.Display, _x11.Atoms.CLIPBOARD, format, format, _handle, IntPtr.Zero);
             return _requestedDataTcs.Task;

tests/Avalonia.Controls.UnitTests/Presenters/ScrollContentPresenterTests.cs

@@ -4,6 +4,7 @@ using System.Reactive.Linq;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Layout;
+using Avalonia.UnitTests;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests.Presenters
@@ -244,6 +245,36 @@ namespace Avalonia.Controls.UnitTests.Presenters
             Assert.Equal(new Size(110, 110), target.Extent);
         }
 
+        [Fact]
+        public void Extent_Should_Include_Content_Margin_Scaled_With_Layout_Rounding()
+        {
+            var root = new TestRoot
+            {
+                LayoutScaling = 1.25,
+                UseLayoutRounding = true
+            };
+
+            var target = new ScrollContentPresenter
+            {
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+                Content = new Border
+                {
+                    Width = 200,
+                    Height = 200,
+                    Margin = new Thickness(2)
+                }
+            };
+
+            root.Child = target;
+            target.UpdateChild();
+            target.Measure(new Size(1000, 1000));
+            target.Arrange(new Rect(0, 0, 1000, 1000));
+
+            Assert.Equal(new Size(203.2, 203.2), target.Viewport);
+            Assert.Equal(new Size(203.2, 203.2), target.Extent);
+        }
+
         [Fact]
         public void Extent_Width_Should_Be_Arrange_Width_When_CanScrollHorizontally_False()
         {