From 6b902254bcc0c251d0c2255da2c1520ec04b63a5 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Wed, 26 Feb 2020 17:52:06 +0100 Subject: [PATCH] Refactored styling. - Don't use Rx in the styling system. Instead introduces `IStyleActivator` which is like an `IObservable`-lite in order to cut down on allocations. - #nullable enable on touched files --- src/Avalonia.Styling/StyledElement.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Avalonia.Styling/StyledElement.cs b/src/Avalonia.Styling/StyledElement.cs index 6b020dd1c0..0bd01d2634 100644 --- a/src/Avalonia.Styling/StyledElement.cs +++ b/src/Avalonia.Styling/StyledElement.cs @@ -207,9 +207,9 @@ namespace Avalonia /// public Styles Styles { - get + get { - if (_styles == null) + if (_styles is null) { _styles = new Styles(this); _styles.ResourcesChanged += ThisResourcesChanged;