Merge branch 'master' into fixes/4781-treeview-setting-bound-selected-item-null

samples/ControlCatalog/App.xaml.cs

@@ -81,7 +81,7 @@ namespace ControlCatalog
 
         public override void Initialize()
         {
-            Styles.Insert(0, FluentDark);
+            Styles.Insert(0, FluentLight);
 
             AvaloniaXamlLoader.Load(this);
         }

samples/ControlCatalog/MainView.xaml

@@ -77,8 +77,8 @@
             <ComboBoxItem>Full Decorations</ComboBoxItem>
           </ComboBox>
           <ComboBox x:Name="Themes" SelectedIndex="0">
-            <ComboBoxItem>Fluent - Dark</ComboBoxItem>
             <ComboBoxItem>Fluent - Light</ComboBoxItem>
+            <ComboBoxItem>Fluent - Dark</ComboBoxItem>
             <ComboBoxItem>Simple - Light</ComboBoxItem>
             <ComboBoxItem>Simple - Dark</ComboBoxItem>
           </ComboBox>

samples/ControlCatalog/MainView.xaml.cs

@@ -38,10 +38,10 @@ namespace ControlCatalog
                 switch (themes.SelectedIndex)
                 {
                     case 0:
-                        Application.Current.Styles[0] = App.FluentDark;
+                        Application.Current.Styles[0] = App.FluentLight;
                         break;
                     case 1:
-                        Application.Current.Styles[0] = App.FluentLight;
+                        Application.Current.Styles[0] = App.FluentDark;
                         break;
                     case 2:
                         Application.Current.Styles[0] = App.DefaultLight;

samples/ControlCatalog/Pages/TextBlockPage.xaml

@@ -18,8 +18,8 @@
       </StackPanel.Styles>
       <Border>
         <StackPanel Width="200" Spacing="8">
-          <TextBlock TextTrimming="CharacterEllipsis" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit."/>
-          <TextBlock TextTrimming="WordEllipsis" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit."/>
+          <TextBlock Margin="0 0 10 0" TextTrimming="CharacterEllipsis" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit."/>
+          <TextBlock Margin="0 0 10 0" TextTrimming="WordEllipsis" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit."/>
           <TextBlock Text="Left aligned text" TextAlignment="Left" />
           <TextBlock Text="Center aligned text" TextAlignment="Center" />
           <TextBlock Text="Right aligned text" TextAlignment="Right" />

src/Avalonia.Base/AvaloniaObject.cs

@@ -113,16 +113,8 @@ namespace Avalonia
         /// <param name="binding">The binding information.</param>
         public IBinding this[IndexerDescriptor binding]
         {
-            get
-            {
-                return new IndexerBinding(this, binding.Property, binding.Mode);
-            }
-
-            set
-            {
-                var sourceBinding = value as IBinding;
-                this.Bind(binding.Property, sourceBinding);
-            }
+            get { return new IndexerBinding(this, binding.Property, binding.Mode); }
+            set { this.Bind(binding.Property, value); }
         }
 
         public bool CheckAccess() => Dispatcher.UIThread.CheckAccess();

src/Avalonia.Controls/Calendar/CalendarItem.cs

@@ -36,11 +36,7 @@ namespace Avalonia.Controls.Primitives
         private Button _headerButton;
         private Button _nextButton;
         private Button _previousButton;
-        private Grid _monthView;
-        private Grid _yearView;
         private ITemplate<IControl> _dayTitleTemplate;
-        private CalendarButton _lastCalendarButton;
-        private CalendarDayButton _lastCalendarDayButton;
         
         private DateTime _currentMonth;
         private bool _isMouseLeftButtonDown = false;
@@ -160,38 +156,12 @@ namespace Avalonia.Controls.Primitives
         /// <summary>
         /// Gets the Grid that hosts the content when in month mode.
         /// </summary>
-        internal Grid MonthView
-        {
-            get { return _monthView; }
-            private set
-            {
-                if (_monthView != null)
-                    _monthView.PointerLeave -= MonthView_MouseLeave;
-
-                _monthView = value;
-
-                if (_monthView != null)
-                    _monthView.PointerLeave += MonthView_MouseLeave;
-            }
-        }
+        internal Grid MonthView { get; set; }
         /// <summary>
         /// Gets the Grid that hosts the content when in year or decade mode.
         /// </summary>
-        internal Grid YearView
-        {
-            get { return _yearView; }
-            private set
-            {
-                if (_yearView != null)
-                    _yearView.PointerLeave -= YearView_MouseLeave;
-
-                _yearView = value;
-
-                if (_yearView != null)
-                    _yearView.PointerLeave += YearView_MouseLeave;
-            }
-        }
-
+        internal Grid YearView { get; set; }
+        
         private void PopulateGrids()
         {
             if (MonthView != null)
@@ -226,7 +196,6 @@ namespace Avalonia.Controls.Primitives
                         cell.CalendarDayButtonMouseDown += Cell_MouseLeftButtonDown;
                         cell.CalendarDayButtonMouseUp += Cell_MouseLeftButtonUp;
                         cell.PointerEnter += Cell_MouseEnter;
-                        cell.PointerLeave += Cell_MouseLeave;
                         cell.Click += Cell_Click;
                         children.Add(cell);
                     }
@@ -256,7 +225,6 @@ namespace Avalonia.Controls.Primitives
                         month.CalendarLeftMouseButtonDown += Month_CalendarButtonMouseDown;
                         month.CalendarLeftMouseButtonUp += Month_CalendarButtonMouseUp;
                         month.PointerEnter += Month_MouseEnter;
-                        month.PointerLeave += Month_MouseLeave;
                         children.Add(month);
                     }
                 }
@@ -937,17 +905,7 @@ namespace Avalonia.Controls.Primitives
                 }
             }
         }
-        internal void Cell_MouseLeave(object sender, PointerEventArgs e)
-        {
-            if (_isMouseLeftButtonDown)
-            {
-                CalendarDayButton b = (CalendarDayButton)sender;
-                // The button is in Pressed state. Change the state to normal.
-                if (e.Pointer.Captured == b)
-                    e.Pointer.Capture(null);
-                _lastCalendarDayButton = b;
-            }
-        }
+        
         internal void Cell_MouseLeftButtonDown(object sender, PointerPressedEventArgs e)
         {
             if (Owner != null)
@@ -1207,35 +1165,6 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
-        private void Month_MouseLeave(object sender, PointerEventArgs e)
-        {
-            if (_isMouseLeftButtonDownYearView)
-            {
-                CalendarButton b = (CalendarButton)sender;
-                // The button is in Pressed state. Change the state to normal.
-                if (e.Pointer.Captured == b)
-                    e.Pointer.Capture(null);
-                //b.ReleaseMouseCapture();
-
-                _lastCalendarButton = b;
-            }
-        }
-        private void MonthView_MouseLeave(object sender, PointerEventArgs e)
-        {
-            if (_lastCalendarDayButton != null)
-            {
-                e.Pointer.Capture(_lastCalendarDayButton);
-            }
-        }
-
-        private void YearView_MouseLeave(object sender, PointerEventArgs e)
-        {
-            if (_lastCalendarButton != null)
-            {
-                e.Pointer.Capture(_lastCalendarButton);
-            }
-        }
-        
         internal void UpdateDisabled(bool isEnabled)
         {
             PseudoClasses.Set(":calendardisabled", !isEnabled);

src/Avalonia.Controls/MenuItem.cs

@@ -101,7 +101,7 @@ namespace Avalonia.Controls
 
         private ICommand? _command;
         private bool _commandCanExecute = true;
-        private Popup _popup;
+        private Popup? _popup;
 
         /// <summary>
         /// Initializes static members of the <see cref="MenuItem"/> class.
@@ -145,7 +145,7 @@ namespace Avalonia.Controls
                 {
                     var parent = x as Control;
                     return parent?.GetObservable(DefinitionBase.PrivateSharedSizeScopeProperty) ??
-                        Observable.Return<DefinitionBase.SharedSizeScope>(null);
+                        Observable.Return<DefinitionBase.SharedSizeScope?>(null);
                 });
 
             this.Bind(DefinitionBase.PrivateSharedSizeScopeProperty, parentSharedSizeScope);

src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs

@@ -148,6 +148,7 @@ namespace Avalonia.Controls.Platform
             {
                 case Key.Up:
                 case Key.Down:
+                {
                     if (item?.IsTopLevel == true)
                     {
                         if (item.HasSubMenu && !item.IsSubMenuOpen)
@@ -161,8 +162,10 @@ namespace Avalonia.Controls.Platform
                         goto default;
                     }
                     break;
+                }
 
                 case Key.Left:
+                {
                     if (item?.Parent is IMenuItem parent && !parent.IsTopLevel && parent.IsSubMenuOpen)
                     {
                         parent.Close();
@@ -174,8 +177,10 @@ namespace Avalonia.Controls.Platform
                         goto default;
                     }
                     break;
+                }
 
                 case Key.Right:
+                {
                     if (item != null && !item.IsTopLevel && item.HasSubMenu)
                     {
                         Open(item, true);
@@ -186,8 +191,10 @@ namespace Avalonia.Controls.Platform
                         goto default;
                     }
                     break;
+                }
 
                 case Key.Enter:
+                {
                     if (item != null)
                     {
                         if (!item.HasSubMenu)
@@ -202,12 +209,14 @@ namespace Avalonia.Controls.Platform
                         e.Handled = true;
                     }
                     break;
+                }
 
                 case Key.Escape:
-                    if (item?.Parent != null)
+                {
+                    if (item?.Parent is IMenuElement parent)
                     {
-                        item.Parent.Close();
-                        item.Parent.Focus();
+                        parent.Close();
+                        parent.Focus();
                     }
                     else
                     {
@@ -216,8 +225,10 @@ namespace Avalonia.Controls.Platform
 
                     e.Handled = true;
                     break;
+                }
 
                 default:
+                {
                     var direction = e.Key.ToNavigationDirection();
 
                     if (direction.HasValue)
@@ -246,6 +257,7 @@ namespace Avalonia.Controls.Platform
                     }
 
                     break;
+                }
             }
 
             if (!e.Handled && item?.Parent is IMenuItem parentItem)

src/Avalonia.Controls/Presenters/TextPresenter.cs

@@ -77,7 +77,8 @@ namespace Avalonia.Controls.Presenters
 
         static TextPresenter()
         {
-            AffectsRender<TextPresenter>(SelectionBrushProperty);
+            AffectsRender<TextPresenter>(SelectionBrushProperty, TextBlock.ForegroundProperty, 
+                                         SelectionForegroundBrushProperty, CaretBrushProperty);
             AffectsMeasure<TextPresenter>(TextProperty, PasswordCharProperty, RevealPasswordProperty, 
                 TextAlignmentProperty, TextWrappingProperty, TextBlock.FontSizeProperty,
                 TextBlock.FontStyleProperty, TextBlock.FontWeightProperty, TextBlock.FontFamilyProperty);

src/Avalonia.Controls/Primitives/SelectingItemsControl.cs

@@ -848,21 +848,6 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
-        /// <summary>
-        /// Sets an item container's 'selected' class or <see cref="ISelectable.IsSelected"/>.
-        /// </summary>
-        /// <param name="index">The index of the item.</param>
-        /// <param name="selected">Whether the item should be selected or deselected.</param>
-        private void MarkItemSelected(int index, bool selected)
-        {
-            var container = ItemContainerGenerator?.ContainerFromIndex(index);
-
-            if (container != null)
-            {
-                MarkContainerSelected(container, selected);
-            }
-        }
-
         private void UpdateContainerSelection()
         {
             if (Presenter?.Panel is IPanel panel)

src/Avalonia.Themes.Fluent/Accents/Base.xaml

@@ -12,7 +12,7 @@
     <Color x:Key="SystemColorHotlightColor">#FF0066CC</Color>
     <Color x:Key="SystemColorWindowColor">#FFFFFFFF</Color>
     <Color x:Key="SystemColorWindowTextColor">#FF000000</Color>
-    <FontFamily x:Key="ContentControlThemeFontFamily">avares://Avalonia.Themes.Fluent/Assets#Roboto</FontFamily>
+    <FontFamily x:Key="ContentControlThemeFontFamily">avares://Avalonia.Themes.Fluent/Assets#Inter</FontFamily>
     <sys:Double x:Key="ControlContentThemeFontSize">14</sys:Double>
 
     <SolidColorBrush x:Key="SystemControlTransparentBrush" Color="Transparent" />

src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml

@@ -439,7 +439,7 @@
     <StaticResource x:Key="CalendarViewNavigationButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
     
     <!--Resources for NotificationCard.xaml -->
-    <SolidColorBrush x:Key="NotificationCardBackgroundBrush" Color="#444444" Opacity="0.75"/>
+    <SolidColorBrush x:Key="NotificationCardBackgroundBrush" Color="#444444" />
     <SolidColorBrush x:Key="NotificationCardProgressBackgroundBrush" Color="#9A9A9A" />
     <SolidColorBrush x:Key="NotificationCardInformationBackgroundBrush" Color="#007ACC" Opacity="0.75"/>
     <SolidColorBrush x:Key="NotificationCardSuccessBackgroundBrush" Color="#1F9E45" Opacity="0.75"/>

src/Avalonia.Visuals/Animation/CompositePageTransition.cs

@@ -0,0 +1,61 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia.Metadata;
+
+namespace Avalonia.Animation
+{
+    /// <summary>
+    /// Defines a composite page transition that can be used to combine multiple transitions.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// Instantiate the <see cref="CompositePageTransition" /> in XAML and initialize the
+    /// <see cref="Transitions" /> property in order to have many animations triggered at once.
+    /// For example, you can combine <see cref="CrossFade"/> and <see cref="PageSlide"/>.
+    /// <code>
+    /// <![CDATA[
+    /// <reactiveUi:RoutedViewHost Router="{Binding Router}">
+    ///   <reactiveUi:RoutedViewHost.PageTransition>
+    ///     <CompositePageTransition>
+    ///       <PageSlide Duration="0.5" />
+    ///       <CrossFade Duration="0.5" />
+    ///     </CompositePageTransition>
+    ///   </reactiveUi:RoutedViewHost.PageTransition>
+    /// </reactiveUi:RoutedViewHost>
+    /// ]]>
+    /// </code>
+    /// </para>
+    /// </remarks>
+    public class CompositePageTransition : IPageTransition
+    {
+        /// <summary>
+        /// Gets or sets the transitions to be executed. Can be defined from XAML.
+        /// </summary>
+        [Content]
+        public List<IPageTransition> PageTransitions { get; set; } = new List<IPageTransition>();
+
+        /// <summary>
+        /// Starts the animation.
+        /// </summary>
+        /// <param name="from">
+        /// The control that is being transitioned away from. May be null.
+        /// </param>
+        /// <param name="to">
+        /// The control that is being transitioned to. May be null.
+        /// </param>
+        /// <param name="forward">
+        /// Defines the direction of the transition.
+        /// </param>
+        /// <returns>
+        /// A <see cref="Task"/> that tracks the progress of the animation.
+        /// </returns>
+        public Task Start(Visual from, Visual to, bool forward)
+        {
+            var transitionTasks = PageTransitions
+                .Select(transition => transition.Start(from, to, forward))
+                .ToList();
+            return Task.WhenAll(transitionTasks);
+        }
+    }
+}

src/Avalonia.Visuals/Animation/CrossFade.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Avalonia.Animation.Easings;
 using Avalonia.Styling;
 using Avalonia.VisualTree;
 
@@ -74,14 +75,26 @@ namespace Avalonia.Animation
         /// </summary>
         public TimeSpan Duration
         {
-            get
-            {
-                return _fadeOutAnimation.Duration;
-            }
-            set
-            {
-                _fadeOutAnimation.Duration = _fadeInAnimation.Duration = value;
-            }
+            get => _fadeOutAnimation.Duration;
+            set => _fadeOutAnimation.Duration = _fadeInAnimation.Duration = value;
+        }
+
+        /// <summary>
+        /// Gets or sets element entrance easing.
+        /// </summary>
+        public Easing FadeInEasing
+        {
+            get => _fadeInAnimation.Easing;
+            set => _fadeInAnimation.Easing = value;
+        }
+
+        /// <summary>
+        /// Gets or sets element exit easing.
+        /// </summary>
+        public Easing FadeOutEasing
+        {
+            get => _fadeOutAnimation.Easing;
+            set => _fadeOutAnimation.Easing = value;
         }
 
         /// <summary>

src/Avalonia.Visuals/Animation/PageSlide.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Avalonia.Animation.Easings;
 using Avalonia.Media;
 using Avalonia.Styling;
 using Avalonia.VisualTree;
@@ -48,6 +49,16 @@ namespace Avalonia.Animation
         /// Gets the duration of the animation.
         /// </summary>
         public SlideAxis Orientation { get; set; }
+        
+        /// <summary>
+        /// Gets or sets element entrance easing.
+        /// </summary>
+        public Easing SlideInEasing { get; set; } = new LinearEasing();
+        
+        /// <summary>
+        /// Gets or sets element exit easing.
+        /// </summary>
+        public Easing SlideOutEasing { get; set; } = new LinearEasing();
 
         /// <summary>
         /// Starts the animation.
@@ -75,18 +86,12 @@ namespace Avalonia.Animation
             {
                 var animation = new Animation
                 {
-                    Children = 
+                    Easing = SlideOutEasing,
+                    Children =
                     {
                         new KeyFrame
                         {
-                            Setters =
-                            {
-                                new Setter
-                                {
-                                    Property = translateProperty,
-                                Value = 0d
-                                }
-                            },
+                            Setters = { new Setter { Property = translateProperty, Value = 0d } },
                             Cue = new Cue(0d)
                         },
                         new KeyFrame
@@ -100,10 +105,10 @@ namespace Avalonia.Animation
                                 }
                             },
                             Cue = new Cue(1d)
-                        }                       
-                    }
+                        }
+                    },
+                    Duration = Duration
                 };
-                animation.Duration = Duration;
                 tasks.Add(animation.RunAsync(from));
             }
 
@@ -112,9 +117,9 @@ namespace Avalonia.Animation
                 to.IsVisible = true;
                 var animation = new Animation
                 {
+                    Easing = SlideInEasing,
                     Children =
                     {
-
                         new KeyFrame
                         {
                             Setters =
@@ -129,19 +134,12 @@ namespace Avalonia.Animation
                         },
                         new KeyFrame
                         {
-                            Setters =
-                            {
-                                new Setter
-                                {
-                                    Property = translateProperty,
-                                    Value = 0d
-                                }
-                            },
+                            Setters = { new Setter { Property = translateProperty, Value = 0d } },
                             Cue = new Cue(1d)
                         }
-                    }
+                    },
+                    Duration = Duration
                 };
-                animation.Duration = Duration;
                 tasks.Add(animation.RunAsync(to));
             }
 

src/Avalonia.Visuals/Media/GlyphRun.cs

@@ -18,7 +18,7 @@ namespace Avalonia.Media
         private double _fontRenderingEmSize;
         private Size? _size;
         private int _biDiLevel;
-        private Point? _baselineOrigin;
+        private Point _baselineOrigin;
 
         private ReadOnlySlice<ushort> _glyphIndices;
         private ReadOnlySlice<double> _glyphAdvances;
@@ -97,9 +97,7 @@ namespace Avalonia.Media
         {
             get
             {
-                _baselineOrigin ??= CalculateBaselineOrigin();
-
-                return _baselineOrigin.Value;
+                return _baselineOrigin;
             }
             set => Set(ref _baselineOrigin, value);
         }
@@ -540,15 +538,6 @@ namespace Avalonia.Media
             return GlyphAdvances[index];
         }
 
-        /// <summary>
-        /// Calculates the default baseline origin of the <see cref="GlyphRun"/>.
-        /// </summary>
-        /// <returns>The baseline origin.</returns>
-        private Point CalculateBaselineOrigin()
-        {
-            return new Point(0, -GlyphTypeface.Ascent * Scale);
-        }
-
         /// <summary>
         /// Calculates the size of the <see cref="GlyphRun"/>.
         /// </summary>
@@ -611,8 +600,6 @@ namespace Avalonia.Media
                 throw new InvalidOperationException();
             }
 
-            _baselineOrigin = new Point(0, -GlyphTypeface.Ascent * Scale);
-
             var platformRenderInterface = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>();
 
             _glyphRunImpl = platformRenderInterface.CreateGlyphRun(this, out var width);

src/Avalonia.Visuals/Media/TextFormatting/ShapedTextCharacters.cs

@@ -52,7 +52,7 @@ namespace Avalonia.Media.TextFormatting
                 return;
             }
 
-            if (Properties.Typeface == null)
+            if (Properties.Typeface == default)
             {
                 return;
             }

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

@@ -43,18 +43,23 @@ namespace Avalonia.Media.TextFormatting
         }
 
         /// <summary>
-        /// Measures the number of characters that fits into available width.
+        /// Measures the number of characters that fit into available width.
         /// </summary>
         /// <param name="textCharacters">The text run.</param>
         /// <param name="availableWidth">The available width.</param>
-        /// <returns></returns>
-        internal static int MeasureCharacters(ShapedTextCharacters textCharacters, double availableWidth)
+        /// <param name="count">The count of fitting characters.</param>
+        /// <returns>
+        /// <c>true</c> if characters fit into the available width; otherwise, <c>false</c>.
+        /// </returns>
+        internal static bool TryMeasureCharacters(ShapedTextCharacters textCharacters, double availableWidth, out int count)
         {
             var glyphRun = textCharacters.GlyphRun;
 
             if (glyphRun.Size.Width < availableWidth)
             {
-                return glyphRun.Characters.Length;
+                count = glyphRun.Characters.Length;
+
+                return true;
             }
 
             var glyphCount = 0;
@@ -96,21 +101,34 @@ namespace Avalonia.Media.TextFormatting
                 }
             }
 
+            if (glyphCount == 0)
+            {
+                count = 0;
+
+                return false;
+            }
+
             if (glyphCount == glyphRun.GlyphIndices.Length)
             {
-                return glyphRun.Characters.Length;
+                count = glyphRun.Characters.Length;
+
+                return true;
             }
 
             if (glyphRun.GlyphClusters.IsEmpty)
             {
-                return glyphCount;
+                count = glyphCount;
+
+                return true;
             }
 
             var firstCluster = glyphRun.GlyphClusters[0];
 
             var lastCluster = glyphRun.GlyphClusters[glyphCount];
 
-            return lastCluster - firstCluster;
+            count = lastCluster - firstCluster;
+
+            return count > 0;
         }
 
         /// <summary>
@@ -350,29 +368,38 @@ namespace Avalonia.Media.TextFormatting
 
                 if (currentWidth + currentRun.Size.Width > availableWidth)
                 {
-                    var measuredLength = MeasureCharacters(currentRun, paragraphWidth - currentWidth);
-
                     var breakFound = false;
 
                     var currentBreakPosition = 0;
 
-                    if (measuredLength < currentRun.Text.Length)
+                    if (TryMeasureCharacters(currentRun, paragraphWidth - currentWidth, out var measuredLength))
                     {
-                        var lineBreaker = new LineBreakEnumerator(currentRun.Text);
-
-                        while (currentBreakPosition < measuredLength && lineBreaker.MoveNext())
+                        if (measuredLength < currentRun.Text.Length)
                         {
-                            var nextBreakPosition = lineBreaker.Current.PositionWrap;
+                            var lineBreaker = new LineBreakEnumerator(currentRun.Text);
 
-                            if (nextBreakPosition == 0 || nextBreakPosition > measuredLength)
+                            while (currentBreakPosition < measuredLength && lineBreaker.MoveNext())
                             {
-                                break;
-                            }
+                                var nextBreakPosition = lineBreaker.Current.PositionWrap;
+
+                                if (nextBreakPosition == 0 || nextBreakPosition > measuredLength)
+                                {
+                                    break;
+                                }
 
-                            breakFound = lineBreaker.Current.Required ||
-                                         lineBreaker.Current.PositionWrap != currentRun.Text.Length;
+                                breakFound = lineBreaker.Current.Required ||
+                                             lineBreaker.Current.PositionWrap != currentRun.Text.Length;
 
-                            currentBreakPosition = nextBreakPosition;
+                                currentBreakPosition = nextBreakPosition;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        // Make sure we wrap at least one character.
+                        if (currentLength == 0)
+                        {
+                            measuredLength = 1;
                         }
                     }
 

src/Avalonia.Visuals/Media/TextFormatting/TextLineImpl.cs

@@ -39,7 +39,9 @@ namespace Avalonia.Media.TextFormatting
 
             foreach (var textRun in _textRuns)
             {
-                using (drawingContext.PushPostTransform(Matrix.CreateTranslation(currentX, 0)))
+                var offsetY = LineMetrics.TextBaseline;
+
+                using (drawingContext.PushPostTransform(Matrix.CreateTranslation(currentX, offsetY)))
                 {
                     textRun.Draw(drawingContext);
                 }
@@ -75,37 +77,35 @@ namespace Avalonia.Media.TextFormatting
 
                 if (currentWidth > availableWidth)
                 {
-                    var measuredLength = TextFormatterImpl.MeasureCharacters(currentRun, availableWidth);
-
-                    var currentBreakPosition = 0;
-
-                    if (measuredLength < textRange.End)
+                    if (TextFormatterImpl.TryMeasureCharacters(currentRun, availableWidth, out var measuredLength))
                     {
-                        var lineBreaker = new LineBreakEnumerator(currentRun.Text);
-
-                        while (currentBreakPosition < measuredLength && lineBreaker.MoveNext())
+                        if (collapsingProperties.Style == TextCollapsingStyle.TrailingWord && measuredLength < textRange.End)
                         {
-                            var nextBreakPosition = lineBreaker.Current.PositionWrap;
+                            var currentBreakPosition = 0;
 
-                            if (nextBreakPosition == 0)
-                            {
-                                break;
-                            }
+                            var lineBreaker = new LineBreakEnumerator(currentRun.Text);
 
-                            if (nextBreakPosition > measuredLength)
+                            while (currentBreakPosition < measuredLength && lineBreaker.MoveNext())
                             {
-                                break;
+                                var nextBreakPosition = lineBreaker.Current.PositionWrap;
+
+                                if (nextBreakPosition == 0)
+                                {
+                                    break;
+                                }
+
+                                if (nextBreakPosition > measuredLength)
+                                {
+                                    break;
+                                }
+
+                                currentBreakPosition = nextBreakPosition;
                             }
 
-                            currentBreakPosition = nextBreakPosition;
+                            measuredLength = currentBreakPosition;
                         }
                     }
 
-                    if (collapsingProperties.Style == TextCollapsingStyle.TrailingWord)
-                    {
-                        measuredLength = currentBreakPosition;
-                    }
-
                     collapsedLength += measuredLength;
 
                     var splitResult = TextFormatterImpl.SplitTextRuns(_textRuns, collapsedLength);

src/Skia/Avalonia.Skia/DrawingContextImpl.cs

@@ -583,14 +583,45 @@ namespace Avalonia.Skia
                     var center = radialGradient.Center.ToPixels(targetSize).ToSKPoint();
                     var radius = (float)(radialGradient.Radius * targetSize.Width);
 
-                    // TODO: There is no SetAlpha in SkiaSharp
-                    //paint.setAlpha(128);
+                    var origin = radialGradient.GradientOrigin.ToPixels(targetSize).ToSKPoint();
 
-                    // would be nice to cache these shaders possibly?
-                    using (var shader =
-                        SKShader.CreateRadialGradient(center, radius, stopColors, stopOffsets, tileMode))
+                    if (origin.Equals(center))
                     {
-                        paintWrapper.Paint.Shader = shader;
+                        // when the origin is the same as the center the Skia RadialGradient acts the same as D2D
+                        using (var shader =
+                            SKShader.CreateRadialGradient(center, radius, stopColors, stopOffsets, tileMode))
+                        {
+                            paintWrapper.Paint.Shader = shader;
+                        }
+                    }
+                    else
+                    {
+                        // when the origin is different to the center use a two point ConicalGradient to match the behaviour of D2D
+
+                        // reverse the order of the stops to match D2D
+                        var reversedColors = new SKColor[stopColors.Length];
+                        Array.Copy(stopColors, reversedColors, stopColors.Length);
+                        Array.Reverse(reversedColors);
+
+                        // and then reverse the reference point of the stops
+                        var reversedStops = new float[stopOffsets.Length];
+                        for (var i = 0; i < stopOffsets.Length; i++)
+                        {
+                            reversedStops[i] = stopOffsets[i];
+                            if (reversedStops[i] > 0 && reversedStops[i] < 1)
+                            {
+                                reversedStops[i] = Math.Abs(1 - stopOffsets[i]);
+                            }
+                        }
+                            
+                        // compose with a background colour of the final stop to match D2D's behaviour of filling with the final color
+                        using (var shader = SKShader.CreateCompose(
+                            SKShader.CreateColor(reversedColors[0]),
+                            SKShader.CreateTwoPointConicalGradient(center, radius, origin, 0, reversedColors, reversedStops, tileMode)
+                        ))
+                        {
+                            paintWrapper.Paint.Shader = shader;
+                        }
                     }
 
                     break;

src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs

@@ -200,6 +200,10 @@ namespace Avalonia.Win32
                             DipFromLParam(lParam), GetMouseModifiers(wParam));
                         break;
                     }
+                // Mouse capture is lost
+                case WindowsMessage.WM_CANCELMODE:
+                    _mouseDevice.Capture(null);
+                    break;
 
                 case WindowsMessage.WM_MOUSEMOVE:
                     {

tests/Avalonia.RenderTests/Media/RadialGradientBrushTests.cs

@@ -18,7 +18,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
         public RadialGradientBrushTests() : base(@"Media\RadialGradientBrush")
         {
         }
-        
+
         [Fact]
         public async Task RadialGradientBrush_RedBlue()
         {
@@ -43,5 +43,127 @@ namespace Avalonia.Direct2D1.RenderTests.Media
             await RenderToFile(target);
             CompareImages();
         }
+
+        /// <summary>
+        /// Tests using a GradientOrigin that falls inside of the circle described by Center/Radius.
+        /// </summary>
+        [Fact]
+        public async Task RadialGradientBrush_RedBlue_Offset_Inside()
+        {
+            Decorator target = new Decorator
+            {
+                Padding = new Thickness(8),
+                Width = 200,
+                Height = 200,
+                Child = new Border
+                {
+                    Background = new RadialGradientBrush
+                    {
+                        GradientStops =
+                        {
+                            new GradientStop { Color = Colors.Red, Offset = 0 },
+                            new GradientStop { Color = Colors.Blue, Offset = 1 }
+                        },
+                        GradientOrigin = new RelativePoint(0.25, 0.25, RelativeUnit.Relative)
+                    }
+                }
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
+
+        /// <summary>
+        /// Tests using a GradientOrigin that falls outside of the circle described by Center/Radius.
+        /// </summary>
+        [Fact]
+        public async Task RadialGradientBrush_RedBlue_Offset_Outside()
+        {
+            Decorator target = new Decorator
+            {
+                Padding = new Thickness(8),
+                Width = 200,
+                Height = 200,
+                Child = new Border
+                {
+                    Background = new RadialGradientBrush
+                    {
+                        GradientStops =
+                        {
+                            new GradientStop { Color = Colors.Red, Offset = 0 },
+                            new GradientStop { Color = Colors.Blue, Offset = 1 }
+                        },
+                        GradientOrigin = new RelativePoint(0.1, 0.1, RelativeUnit.Relative)
+                    }
+                }
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
+
+        /// <summary>
+        /// Tests using a GradientOrigin that falls inside of the circle described by Center/Radius.
+        /// </summary>
+        [Fact]
+        public async Task RadialGradientBrush_RedGreenBlue_Offset_Inside()
+        {
+            Decorator target = new Decorator
+            {
+                Padding = new Thickness(8),
+                Width = 200,
+                Height = 200,
+                Child = new Border
+                {
+                    Background = new RadialGradientBrush
+                    {
+                        GradientStops =
+                        {
+                            new GradientStop { Color = Colors.Red, Offset = 0 },
+                            new GradientStop { Color = Colors.Green, Offset = 0.5 },
+                            new GradientStop { Color = Colors.Blue, Offset = 1 }
+                        },
+                        GradientOrigin = new RelativePoint(0.25, 0.25, RelativeUnit.Relative),
+                        Center = new RelativePoint(0.5, 0.5, RelativeUnit.Relative),
+                        Radius = 0.5                        
+                    }
+                }
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
+
+        /// <summary>
+        /// Tests using a GradientOrigin that falls outside of the circle described by Center/Radius.
+        /// </summary>
+        [Fact]
+        public async Task RadialGradientBrush_RedGreenBlue_Offset_Outside()
+        {
+            Decorator target = new Decorator
+            {
+                Padding = new Thickness(8),
+                Width = 200,
+                Height = 200,
+                Child = new Border
+                {
+                    Background = new RadialGradientBrush
+                    {
+                        GradientStops =
+                        {
+                            new GradientStop { Color = Colors.Red, Offset = 0 },
+                            new GradientStop { Color = Colors.Green, Offset = 0.25 },
+                            new GradientStop { Color = Colors.Blue, Offset = 1 }
+                        },
+                        GradientOrigin = new RelativePoint(0.1, 0.1, RelativeUnit.Relative),
+                        Center = new RelativePoint(0.5, 0.5, RelativeUnit.Relative),
+                        Radius = 0.5
+                    }
+                }
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
     }
 }

tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextFormatterTests.cs

@@ -293,6 +293,34 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
             }
         }
 
+        [Fact]
+        public void Wrap_Should_Not_Produce_Empty_Lines()
+        {
+            using (Start())
+            {
+                const string text = "012345";
+
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+                var paragraphProperties = new GenericTextParagraphProperties(defaultProperties, textWrapping: TextWrapping.Wrap);
+                var textSource = new SingleBufferTextSource(text, defaultProperties);
+                var formatter = new TextFormatterImpl();
+
+                var textSourceIndex = 0;
+
+                while (textSourceIndex < text.Length)
+                {
+                    var textLine =
+                        formatter.FormatLine(textSource, textSourceIndex, 3, paragraphProperties);
+
+                    Assert.NotEqual(0, textLine.TextRange.Length);
+
+                    textSourceIndex += textLine.TextRange.Length;
+                }
+
+                Assert.Equal(text.Length, textSourceIndex);
+            }
+        }
+
         public static IDisposable Start()
         {
             var disposable = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface

tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs

@@ -575,6 +575,24 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
             }
         }
 
+        [Fact]
+        public void Should_Wrap_Min_OneCharacter_EveryLine()
+        {
+            using (Start())
+            {
+                var layout = new TextLayout(
+                    s_singleLineText,
+                    Typeface.Default,
+                    12,
+                    Brushes.Black,
+                    textWrapping: TextWrapping.Wrap,
+                    maxWidth: 3);
+
+                //every character should be new line as there not enough space for even one character
+                Assert.Equal(s_singleLineText.Length, layout.TextLines.Count);
+            }
+        }
+
         private static IDisposable Start()
         {
             var disposable = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface