From 47cc3ff1f7e3fe5b603dc5a6a8a8cc5d560ca3df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20S=CC=8Colte=CC=81s?= Date: Tue, 6 May 2025 12:25:13 +0200 Subject: [PATCH] Revert "We don't actually need to Add child in AddChild" This reverts commit c2cd3012ca7fb0b007872e8a1bf0f54ef3cf4cea. --- src/Avalonia.Base/Styling/StyleBase.cs | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/Avalonia.Base/Styling/StyleBase.cs b/src/Avalonia.Base/Styling/StyleBase.cs index dbffcfb3ee..fc293f4bda 100644 --- a/src/Avalonia.Base/Styling/StyleBase.cs +++ b/src/Avalonia.Base/Styling/StyleBase.cs @@ -72,11 +72,24 @@ namespace Avalonia.Styling public void Add(SetterBase setter) => Setters.Add(setter); public void Add(IStyle style) => Children.Add(style); - void IAddChild.AddChild(object child) { } + void IAddChild.AddChild(object child) + { + switch (child) + { + case SetterBase setter: + Setters.Add(setter); + break; + case IStyle style: + Children.Add(style); + break; + default: + throw new InvalidOperationException($"Cannot add {child.GetType()} to a style."); + } + } - void IAddChild.AddChild(SetterBase setter) { } + void IAddChild.AddChild(SetterBase setter) => Setters.Add(setter); - void IAddChild.AddChild(IStyle style) { } + void IAddChild.AddChild(IStyle style) => Children.Add(style); public event EventHandler? OwnerChanged;