From a2d572e006cfd30eb6825f0cf3e33b55cef0e91e Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Wed, 21 Jun 2023 09:43:28 +0200
Subject: [PATCH] Don't set uncoerced value to coerced default val.

Fixes #11484
---
 src/Avalonia.Base/PropertyStore/EffectiveValue`1.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Base/PropertyStore/EffectiveValue`1.cs b/src/Avalonia.Base/PropertyStore/EffectiveValue`1.cs
index 4518289335..a69d7b7094 100644
--- a/src/Avalonia.Base/PropertyStore/EffectiveValue`1.cs
+++ b/src/Avalonia.Base/PropertyStore/EffectiveValue`1.cs
@@ -216,7 +216,7 @@ namespace Avalonia.PropertyStore
                 valueChanged = !EqualityComparer<T>.Default.Equals(Value, v);
                 Value = v;
                 Priority = priority;
-                if (_uncommon is not null)
+                if (!isCoercedDefaultValue && _uncommon is not null)
                     _uncommon._uncoercedValue = value;
             }
 
@@ -225,7 +225,7 @@ namespace Avalonia.PropertyStore
                 baseValueChanged = !EqualityComparer<T>.Default.Equals(_baseValue, v);
                 _baseValue = v;
                 BasePriority = priority;
-                if (_uncommon is not null)
+                if (!isCoercedDefaultValue && _uncommon is not null)
                     _uncommon._uncoercedBaseValue = value;
             }