Browse Source

Fixed some of Rider's complaints

pull/7260/head
Nikita Tsukanov 5 years ago
parent
commit
9e5050cab9
  1. 2
      src/Avalonia.Base/Utilities/WeakSubscriptionManager.cs
  2. 4
      src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakEnumerator.cs

2
src/Avalonia.Base/Utilities/WeakSubscriptionManager.cs

@ -180,7 +180,7 @@ namespace Avalonia.Utilities
{ {
var r = _data[c]; var r = _data[c];
if (r?.TryGetTarget(out var sub) == true) if (r?.TryGetTarget(out var sub) == true)
sub.OnEvent(sender, eventArgs); sub!.OnEvent(sender, eventArgs);
else else
needCompact = true; needCompact = true;
} }

4
src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakEnumerator.cs

@ -80,12 +80,12 @@ namespace Avalonia.Media.TextFormatting.Unicode
} }
} }
var shouldBreak = GetSimpleBreak() ?? (bool?)GetPairTableBreak(lastClass); var shouldBreak = GetSimpleBreak() ?? GetPairTableBreak(lastClass);
// Rule LB8a // Rule LB8a
_lb8a = _nextClass == LineBreakClass.ZWJ; _lb8a = _nextClass == LineBreakClass.ZWJ;
if (shouldBreak.Value) if (shouldBreak)
{ {
Current = new LineBreak(FindPriorNonWhitespace(_lastPosition), _lastPosition); Current = new LineBreak(FindPriorNonWhitespace(_lastPosition), _lastPosition);
return true; return true;

Loading…
Cancel
Save