Browse Source
Merge pull request #7260 from AvaloniaUI/fixes/some-rider-complaints
Fixed some of Rider's complaints
pull/7266/head
Max Katz
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
3 deletions
-
src/Avalonia.Base/Utilities/WeakSubscriptionManager.cs
-
src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakEnumerator.cs
|
|
|
@ -180,7 +180,7 @@ namespace Avalonia.Utilities |
|
|
|
{ |
|
|
|
var r = _data[c]; |
|
|
|
if (r?.TryGetTarget(out var sub) == true) |
|
|
|
sub.OnEvent(sender, eventArgs); |
|
|
|
sub!.OnEvent(sender, eventArgs); |
|
|
|
else |
|
|
|
needCompact = true; |
|
|
|
} |
|
|
|
|
|
|
|
@ -80,12 +80,12 @@ namespace Avalonia.Media.TextFormatting.Unicode |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
var shouldBreak = GetSimpleBreak() ?? (bool?)GetPairTableBreak(lastClass); |
|
|
|
var shouldBreak = GetSimpleBreak() ?? GetPairTableBreak(lastClass); |
|
|
|
|
|
|
|
// Rule LB8a
|
|
|
|
_lb8a = _nextClass == LineBreakClass.ZWJ; |
|
|
|
|
|
|
|
if (shouldBreak.Value) |
|
|
|
if (shouldBreak) |
|
|
|
{ |
|
|
|
Current = new LineBreak(FindPriorNonWhitespace(_lastPosition), _lastPosition); |
|
|
|
return true; |
|
|
|
|