From 324c6ef5cea83b5b53a9670f23a1f763d7ad1b19 Mon Sep 17 00:00:00 2001 From: Max Katz Date: Fri, 29 May 2020 01:12:51 -0400 Subject: [PATCH 1/8] Add resources for AutoCompleteBox --- src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml | 12 ++++++------ src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml | 12 ++++++------ .../Accents/FluentBaseDark.xaml | 8 +++++++- .../Accents/FluentBaseLight.xaml | 8 +++++++- .../Accents/FluentControlResourcesDark.xaml | 6 ++++++ .../Accents/FluentControlResourcesLight.xaml | 6 ++++++ 6 files changed, 38 insertions(+), 14 deletions(-) diff --git a/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml b/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml index 7ce6c5a19f..b404661d1d 100644 --- a/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml +++ b/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml @@ -159,8 +159,8 @@ 24 40 3 - 374 - 0 + 374 + 0 2 0 21 @@ -258,10 +258,10 @@ 0,0,0,0 0,0,0,0 3,0,3,0 - 1 - 0,2,0,2 - -1,0,-1,0 - 12,11,0,13 + 1 + 0,2,0,2 + -1,0,-1,0 + 12,11,0,13 2 2 2 diff --git a/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml b/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml index 026edca4f9..b370ec7dbf 100644 --- a/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml +++ b/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml @@ -158,8 +158,8 @@ 24 40 3 - 374 - 0 + 374 + 0 2 0 21 @@ -257,10 +257,10 @@ 0,0,0,0 0,0,0,0 3,0,3,0 - 1 - 0,2,0,2 - -1,0,-1,0 - 12,11,0,13 + 1 + 0,2,0,2 + -1,0,-1,0 + 12,11,0,13 2 2 2 diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml index 9fe9f5389e..57216c008a 100644 --- a/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml +++ b/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml @@ -135,7 +135,13 @@ - + + + + + + 12 + diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml index 87cc0d38a0..bf874ce3f1 100644 --- a/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml +++ b/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml @@ -135,7 +135,13 @@ - + + + + + + 12 + diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml index f09569e613..d99774b788 100644 --- a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml +++ b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml @@ -82,6 +82,12 @@ + + + + + 12 + 1 0 diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml index 97497495be..79dcbae50f 100644 --- a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml +++ b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml @@ -82,6 +82,12 @@ + + + + + 12 + 1 0 From 9c67a01d624e31d478c923a2d1fa5182f083be29 Mon Sep 17 00:00:00 2001 From: Max Katz Date: Fri, 29 May 2020 01:13:14 -0400 Subject: [PATCH 2/8] Add Fluent AutoCompleteBox Style --- .../AutoCompleteBox.xaml | 65 +++++++++++++------ 1 file changed, 46 insertions(+), 19 deletions(-) diff --git a/src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml b/src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml index 788b60892b..cdf79cac01 100644 --- a/src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml +++ b/src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml @@ -1,37 +1,64 @@ - + + + + + + Alabama + Alaska + Arizona + Arkansas + California + Colorado + Connecticut + Delaware + + + + + From 83f7890ac243744e8e6af72d05c55492bc6116ab Mon Sep 17 00:00:00 2001 From: Max Katz Date: Fri, 29 May 2020 01:13:53 -0400 Subject: [PATCH 3/8] Add SystemControlTransientBackgroundBrush resource with fallback color as Color value --- src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml | 1 + src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml | 1 + .../Accents/FluentControlResourcesDark.xaml | 4 ++-- .../Accents/FluentControlResourcesLight.xaml | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml b/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml index b404661d1d..c20141675d 100644 --- a/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml +++ b/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml @@ -139,6 +139,7 @@ + False diff --git a/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml b/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml index b370ec7dbf..b25c0c6116 100644 --- a/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml +++ b/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml @@ -139,6 +139,7 @@ + False diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml index d99774b788..ab83f4f474 100644 --- a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml +++ b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml @@ -83,8 +83,8 @@ - - + + 12 diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml index 79dcbae50f..7c132dd22f 100644 --- a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml +++ b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml @@ -83,8 +83,8 @@ - - + + 12 From 890513e8a9116ce93b70ade6876775968e59b48f Mon Sep 17 00:00:00 2001 From: Max Katz Date: Fri, 29 May 2020 01:54:03 -0400 Subject: [PATCH 4/8] Add missed Padding --- src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml b/src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml index cdf79cac01..262b9286e0 100644 --- a/src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml +++ b/src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml @@ -37,6 +37,7 @@ FontSize="{TemplateBinding FontSize}" FontFamily="{TemplateBinding FontFamily}" FontWeight="{TemplateBinding FontWeight}" + Padding="{TemplateBinding Padding}" Margin="0" DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}" /> @@ -53,6 +54,7 @@ CornerRadius="{DynamicResource OverlayCornerRadius}"> From e08e6a44abb3f4a571b342737ccc1c86ffa4f549 Mon Sep 17 00:00:00 2001 From: Max Katz Date: Fri, 29 May 2020 03:18:31 -0400 Subject: [PATCH 5/8] Remove AutoCompleteListMaxHeight in favor of MaxDropDownHeight --- src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml | 1 - src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml | 1 - src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml | 1 - 3 files changed, 3 deletions(-) diff --git a/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml b/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml index c20141675d..bf169400f0 100644 --- a/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml +++ b/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml @@ -160,7 +160,6 @@ 24 40 3 - 374 0 2 0 diff --git a/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml b/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml index b25c0c6116..b32c816851 100644 --- a/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml +++ b/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml @@ -159,7 +159,6 @@ 24 40 3 - 374 0 2 0 diff --git a/src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml b/src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml index 262b9286e0..97d6153c46 100644 --- a/src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml +++ b/src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml @@ -56,7 +56,6 @@ BorderThickness="0" Foreground="{DynamicResource AutoCompleteBoxSuggestionsListForeground}" ItemTemplate="{TemplateBinding ItemTemplate}" - MaxHeight="{DynamicResource AutoCompleteListMaxHeight}" Margin="{DynamicResource AutoCompleteListPadding}" /> From 6cb6820f794e49d533c09a02c9ad4f8e40313553 Mon Sep 17 00:00:00 2001 From: Max Katz Date: Fri, 29 May 2020 05:10:11 -0400 Subject: [PATCH 6/8] Add missed default value for Padding --- src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml b/src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml index 97d6153c46..c9e6d880c1 100644 --- a/src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml +++ b/src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml @@ -24,6 +24,7 @@ + From c25fe3a80cdf029b3a3b427b0f47b2cf79aa6d22 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 29 May 2020 17:01:05 -0300 Subject: [PATCH 7/8] working transparent popup --- src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml b/src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml index c9e6d880c1..11f9b85894 100644 --- a/src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml +++ b/src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml @@ -47,14 +47,22 @@ MaxHeight="{TemplateBinding MaxDropDownHeight}" StaysOpen="False" PlacementTarget="{TemplateBinding}"> + + + From 85f37abe21fccfa66c15af7f3f947bcb2b1069fc Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 29 May 2020 17:33:53 -0300 Subject: [PATCH 8/8] transparent popups --- .../AutoCompleteBox.xaml | 15 +++----- src/Avalonia.Themes.Fluent/PopupRoot.xaml | 38 ++++++++++--------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml b/src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml index 11f9b85894..52bacdb36e 100644 --- a/src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml +++ b/src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml @@ -1,4 +1,5 @@ - + @@ -43,17 +44,11 @@ DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}" /> - - - + StaysOpen="False" + PlacementTarget="{TemplateBinding}"> - - - - - - - - - - - - + + +