From d3dd8062288d7e0a9b6264c6aafea8965e30ca90 Mon Sep 17 00:00:00 2001 From: donandren Date: Sat, 6 Aug 2016 15:48:33 +0300 Subject: [PATCH] SetForegroundBrush in skia uses the smallest Length first. fixes #658 --- src/Skia/Avalonia.Skia/FormattedTextImpl.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Skia/Avalonia.Skia/FormattedTextImpl.cs b/src/Skia/Avalonia.Skia/FormattedTextImpl.cs index dc1c93819c..b4078c812d 100644 --- a/src/Skia/Avalonia.Skia/FormattedTextImpl.cs +++ b/src/Skia/Avalonia.Skia/FormattedTextImpl.cs @@ -449,7 +449,10 @@ namespace Avalonia.Skia if (_foregroundBrushes.Any()) { - var cbi = _foregroundBrushes.FirstOrDefault(b => b.Key.Intersects(index, len)); + var cbi = _foregroundBrushes + .Where(b => b.Key.Intersects(index, len)) + .OrderBy(b => b.Key.Length) + .FirstOrDefault(); if (cbi.Value != null) {