Browse Source

Fix possible NRE

pull/10821/head
Benedikt Stebner 4 years ago
parent
commit
1964afb854
  1. 6
      src/Avalonia.Controls/SelectableTextBlock.cs

6
src/Avalonia.Controls/SelectableTextBlock.cs

@ -228,7 +228,7 @@ namespace Avalonia.Controls
{
base.OnPointerPressed(e);
var text = HasComplexContent ? Inlines.Text : Text;
var text = HasComplexContent ? Inlines?.Text : Text;
var clickInfo = e.GetCurrentPoint(this);
if (text != null && clickInfo.Properties.IsLeftButtonPressed)
@ -314,7 +314,7 @@ namespace Avalonia.Controls
// selection should not change during pointer move if the user right clicks
if (e.Pointer.Captured == this && e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
{
var text = HasComplexContent ? Inlines.Text : Text;
var text = HasComplexContent ? Inlines?.Text : Text;
var padding = Padding;
var point = e.GetPosition(this) - new Point(padding.Left, padding.Top);
@ -397,7 +397,7 @@ namespace Avalonia.Controls
private string GetSelection()
{
var text = HasComplexContent ? Inlines.Text : Text;
var text = HasComplexContent ? Inlines?.Text : Text;
var textLength = text?.Length ?? 0;

Loading…
Cancel
Save