From d72ca725cde7639d66c58a899530f6ba45f423f5 Mon Sep 17 00:00:00 2001 From: wojciech krysiak Date: Mon, 27 Aug 2018 19:27:19 +0200 Subject: [PATCH] Brought RelativeSource=Self behavior in line with other RelativeSources -Direct fix for AnimationKeyFrame using itself as self-reference --- src/Markup/Avalonia.Markup/Data/Binding.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Markup/Avalonia.Markup/Data/Binding.cs b/src/Markup/Avalonia.Markup/Data/Binding.cs index 4f18c682b4..cb43873cee 100644 --- a/src/Markup/Avalonia.Markup/Data/Binding.cs +++ b/src/Markup/Avalonia.Markup/Data/Binding.cs @@ -150,7 +150,9 @@ namespace Avalonia.Data } else if (RelativeSource.Mode == RelativeSourceMode.Self) { - observer = CreateSourceObserver(target, node); + observer = CreateSourceObserver( + (target as IStyledElement) ?? (anchor as IStyledElement), + node); } else if (RelativeSource.Mode == RelativeSourceMode.TemplatedParent) {