wip

dotnet · Apr 7, 2023 · af09d9a · af09d9a
1 parent 6956d54
commit af09d9a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/Controls/src/Core/MergedStyle.cs b/src/Controls/src/Core/MergedStyle.cs
@@ -184,7 +184,7 @@ void SetStyle(IStyle implicitStyle, IList<Style> classStyles, IStyle style)
 		{
 			bool shouldReApplyStyle = implicitStyle != ImplicitStyle || classStyles != ClassStyles || Style != style;
 			bool shouldReApplyClassStyle = implicitStyle != ImplicitStyle || classStyles != ClassStyles;
-			bool shouldReApplyImplicitStyle = implicitStyle != ImplicitStyle && (Style as Style == null || ((Style)Style).CanCascade);
+			bool shouldReApplyImplicitStyle = implicitStyle != ImplicitStyle;
 
 			if (shouldReApplyStyle)
 				Style?.UnApply(Target);

diff --git a/src/Controls/src/Core/Style.cs b/src/Controls/src/Core/Style.cs
@@ -185,6 +185,7 @@ void UnApplyCore(BindableObject bindable, Style basedOn)
 			((AttachedCollection<Behavior>)Behaviors).DetachFrom(bindable);
 
 			if (!specificities.TryGetValue(bindable, out var specificity))
+				return;
 
 			foreach (Setter setter in Setters)
 				setter.UnApply(bindable, (SetterSpecificity)specificity);