From a42284bfc4060644ab4e0d2784defb4b68461f89 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Sun, 25 Oct 2020 14:43:33 +0000 Subject: [PATCH 1/6] update to latest xamlil --- src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github b/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github index 7d15a92274..5420df861c 160000 --- a/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github +++ b/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github @@ -1 +1 @@ -Subproject commit 7d15a9227461cf4d62bc2ed251fcc25c96b28aaf +Subproject commit 5420df861ce6f2be5ead9efa078fe7242ce88f18 From b2a758a77e9002d756292e12581af9a04a14f9ac Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Sun, 25 Oct 2020 14:43:47 +0000 Subject: [PATCH 2/6] fix resolvebyname extension so it can never return null. --- .../MarkupExtensions/ResolveByNameExtension.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResolveByNameExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResolveByNameExtension.cs index 8561aa898b..909462392c 100644 --- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResolveByNameExtension.cs +++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResolveByNameExtension.cs @@ -30,7 +30,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions if (provideValueTarget.TargetProperty is IPropertyInfo property) value.OnCompleted(() => property.Set(target, value.GetResult())); - return null; + return AvaloniaProperty.UnsetValue; } } } From c91ab16eecbedefefad6817e74e21c99b5c236b9 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Sun, 25 Oct 2020 14:44:07 +0000 Subject: [PATCH 3/6] add resolvebyname attribute to labels target property. --- src/Avalonia.Controls/Label.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Avalonia.Controls/Label.cs b/src/Avalonia.Controls/Label.cs index 76708b8f00..9d5eda464f 100644 --- a/src/Avalonia.Controls/Label.cs +++ b/src/Avalonia.Controls/Label.cs @@ -29,6 +29,7 @@ namespace Avalonia.Controls /// /// Label focus Target /// + [ResolveByName] public IInputElement Target { get => _target; From d17006f480de969bdcf42cf0b67168585faa0f1a Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Sun, 25 Oct 2020 14:51:19 +0000 Subject: [PATCH 4/6] make label page use compiled references to label --- samples/ControlCatalog/Pages/LabelsPage.axaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/ControlCatalog/Pages/LabelsPage.axaml b/samples/ControlCatalog/Pages/LabelsPage.axaml index 32c46f080d..961e7ba7e6 100644 --- a/samples/ControlCatalog/Pages/LabelsPage.axaml +++ b/samples/ControlCatalog/Pages/LabelsPage.axaml @@ -25,11 +25,11 @@ - + - + - + From 99833d24b5acdaa86477a7dc853bb4702041f7f4 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Sun, 25 Oct 2020 14:51:33 +0000 Subject: [PATCH 5/6] relative panel page also uses compiled references. --- .../ControlCatalog/Pages/RelativePanelPage.axaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/samples/ControlCatalog/Pages/RelativePanelPage.axaml b/samples/ControlCatalog/Pages/RelativePanelPage.axaml index 3657d52bd9..4dcdcc195f 100644 --- a/samples/ControlCatalog/Pages/RelativePanelPage.axaml +++ b/samples/ControlCatalog/Pages/RelativePanelPage.axaml @@ -23,16 +23,16 @@ - + - + - + @@ -41,19 +41,19 @@ - + - + - + - + - + From 9eee4f9b98592673073f4222c72ff681f6ef2060 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Sun, 25 Oct 2020 14:51:44 +0000 Subject: [PATCH 6/6] put label page in correct order. --- samples/ControlCatalog/MainView.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml index 488aa0535f..f001425964 100644 --- a/samples/ControlCatalog/MainView.xaml +++ b/samples/ControlCatalog/MainView.xaml @@ -14,7 +14,6 @@ - @@ -45,6 +44,7 @@ ScrollViewer.HorizontalScrollBarVisibility="Disabled"> +