From 58236fdb138c0ac1f64f77604aa888d1c6a15fc7 Mon Sep 17 00:00:00 2001 From: amwx Date: Tue, 5 Oct 2021 17:35:44 -0400 Subject: [PATCH 01/35] Begin 1.1.5 stuff --- FluentAvalonia/FluentAvalonia.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FluentAvalonia/FluentAvalonia.csproj b/FluentAvalonia/FluentAvalonia.csproj index 3fc56b1c..95a85b49 100644 --- a/FluentAvalonia/FluentAvalonia.csproj +++ b/FluentAvalonia/FluentAvalonia.csproj @@ -10,8 +10,8 @@ MIT - 1.1.3 - 1.1.3.0 + 1.1.5 + 1.1.5.0 From 85054d8a278d98a88249d52fffa1e3254759c1b7 Mon Sep 17 00:00:00 2001 From: amwx Date: Tue, 12 Oct 2021 01:36:16 -0400 Subject: [PATCH 02/35] Initial Resource Updates --- .../Styling/StylesV2/BaseResources.axaml | 5 +- .../Styling/StylesV2/Controls.axaml | 1 - .../Styling/StylesV2/DarkResources.axaml | 2648 ++++++++++------- .../Styling/StylesV2/LightResources.axaml | 2483 +++++++++------- 4 files changed, 3042 insertions(+), 2095 deletions(-) diff --git a/FluentAvalonia/Styling/StylesV2/BaseResources.axaml b/FluentAvalonia/Styling/StylesV2/BaseResources.axaml index f601a5f5..b6536a04 100644 --- a/FluentAvalonia/Styling/StylesV2/BaseResources.axaml +++ b/FluentAvalonia/Styling/StylesV2/BaseResources.axaml @@ -18,10 +18,7 @@ 456 40 96 - - 1 - 2 - 10,6,6,5 + 32 64 diff --git a/FluentAvalonia/Styling/StylesV2/Controls.axaml b/FluentAvalonia/Styling/StylesV2/Controls.axaml index a8157125..1a70a3c8 100644 --- a/FluentAvalonia/Styling/StylesV2/Controls.axaml +++ b/FluentAvalonia/Styling/StylesV2/Controls.axaml @@ -42,7 +42,6 @@ - diff --git a/FluentAvalonia/Styling/StylesV2/DarkResources.axaml b/FluentAvalonia/Styling/StylesV2/DarkResources.axaml index 26b01849..8d2db380 100644 --- a/FluentAvalonia/Styling/StylesV2/DarkResources.axaml +++ b/FluentAvalonia/Styling/StylesV2/DarkResources.axaml @@ -1,218 +1,220 @@ - #FFFFFF - #C5FFFFFF - #87FFFFFF - #5DFFFFFF - #E4000000 - - #5DFFFFFF - #FFFFFF - #000000 - #80000000 - #87FFFFFF - - #0FFFFFFF - #15FFFFFF - #08FFFFFF - #0BFFFFFF - #00FFFFFF - #B31E1E1E - - #8BFFFFFF - #3FFFFFFF - - #454545 - - #00FFFFFF - #0FFFFFFF - #0AFFFFFF - #00FFFFFF - - #00FFFFFF - #19000000 - #0BFFFFFF - #12FFFFFF - #00FFFFFF - - #B31C1C1C - #1A1A1A - #131313 - #1E1E1E - - #28FFFFFF - - #12FFFFFF - #18FFFFFF - #14FFFFFF - #23000000 - #37000000 - #33000000 - - #6B000000 - - #19000000 - #1C1C1C - - #8BFFFFFF - #28FFFFFF - - #66757575 - #33000000 - #0F000000 - - #15FFFFFF - - #FFFFFF - #B3000000 - - #0DFFFFFF - #08FFFFFF - - #4D000000 - - #4C3A3A3A - #0DFFFFFF - #09FFFFFF - #09FFFFFF - - #202020 - #1C1C1C - #282828 - #2C2C2C + + + #FFFFFF + #C5FFFFFF + #87FFFFFF + #5DFFFFFF + #E4000000 + + #5DFFFFFF + #FFFFFF + #000000 + #80000000 + #87FFFFFF + + #0FFFFFFF + #15FFFFFF + #08FFFFFF + #0BFFFFFF + #00FFFFFF + #B31E1E1E + + #8BFFFFFF + #3FFFFFFF + + #454545 + + #00FFFFFF + #0FFFFFFF + #0AFFFFFF + #00FFFFFF + + #00FFFFFF + #19000000 + #0BFFFFFF + #12FFFFFF + #00FFFFFF + + #B31C1C1C + #1A1A1A + #131313 + #1E1E1E + + #28FFFFFF + + #12FFFFFF + #18FFFFFF + #14FFFFFF + #23000000 + #37000000 + #33000000 + + #6B000000 + + #19000000 + #1C1C1C + + #8BFFFFFF + #28FFFFFF + + #66757575 + #33000000 + #0F000000 + + #15FFFFFF + + #FFFFFF + #B3000000 + + #0DFFFFFF + #08FFFFFF + + #4D000000 + + #4C3A3A3A + #0DFFFFFF + #09FFFFFF + #09FFFFFF + + #202020 + #1C1C1C + #282828 + #2C2C2C #00202020 - - #6CCB5F - #FCE100 - #FF99A4 - #8BFFFFFF + + #6CCB5F + #FCE100 + #FF99A4 + #8BFFFFFF #9D9D9D - #08FFFFFF - #393D1B - #433519 - #442726 - #08FFFFFF + #08FFFFFF + #393D1B + #433519 + #442726 + #08FFFFFF #2E2E2E #2E2E2E - - - - - - - + - - - - + + + + + - + + + + - - - + - - - - - - + + + - - + + + + + + - + + - - - - + - - - - - + + + + - - - - + + + + + - + + + + - - - - + - - - - - - + + + + - + + + + + + - - + - - + + - - - + + - + + + - - + - - + + - + + - - - - + - - - - + + + + - - - - - + + + + + + + + + + - - - - - + + + + + - - - - + + + + + + + + + + + @@ -237,258 +239,419 @@ - - - - - - - - - + + + + True + 1 + + 1,2,1,1 + 10,5,6,6 + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + + + 1 + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 80 + 1 + 20 + 20 + 0,0,0,4 + Normal @@ -508,32 +671,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 80 + 1 + 1 + 0,0,0,4 + 0,0,20,0 + 20,0,0,0 + Normal @@ -553,169 +742,225 @@ - - - - - - - - + + + + + + + + + + + - - - - - - 0 - - - - + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + CharacterEllipsis + 0 + 0 + + 28,0,0,0 + 56,0,0,0 + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 0 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + 4 + 4 + 0 + 0,0,0,4 + Normal + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -732,381 +977,406 @@ - - - - - - - - - - - - - - - - - - - #5DFEFEFE - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + #5DFEFEFE + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + 12 + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 0 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + 1 + + 320 + 548 + 184 + 756 + + + 8 + 0,0,0,12 + 24 + 0,0,0,1 + - - - - + + + + + + + + 1 + + + 0 + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 160 + 240 + 480 + 198 + + + + + 1 + + + + + + + + 1 + 0,0,0,1 + 0,1,0,0 + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - 0 - - - - + + + 1 + + + + + + + + + + + + + + 1 + + + + + + + + + + + 0 + + + + + + + @@ -1128,34 +1398,41 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + @@ -1164,144 +1441,324 @@ - - - - - - - - - - - - - - - - - - + + + 0 + + + + + + + + + + True + -40.5 + 0.3 + 0.80 + 0.80 + 0.50 + 0.95 + 10.0 + 4 + 88 + 40 + 4 + + + + + + + + + + + + + + + + + + + + + + + + + True + + + + + + + + + + + + + + + + + + + 4 + 3 + 1.5 + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - 1 + + 1 - - - - - - - - - - - - - 1 + + + + + + + + + + + + + 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 4,2 - 0,3,0,5 - 28 - 28 - 20 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 4,2 + 0,3,0,5 + 28 + 28 + 20 + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + 8 + 8 + 14 + 8 + 0,3,0,0 + 1,13,1,13 + 0 + 0 + 0,2,0,0 + 0,9,0,0 + 8,7,8,8 + 12,11.5,12,11.5 + 7,6,3,7 + 3,6,3,7 + 3,6,7,7 + -2 + SemiBold + SemiBold + Normal + + + + + + - 0 - - - - + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 1,1,1,0 + 1,0,1,1 + + + 12,0,12,0 @@ -1339,6 +1796,19 @@ + + + 320 + 48 + 0,0,1,0 + 1,0,0,0 + + 00:00:00.2 + 00:00:00.19999 + 00:00:00.1 + 0 + + diff --git a/FluentAvalonia/Styling/StylesV2/LightResources.axaml b/FluentAvalonia/Styling/StylesV2/LightResources.axaml index 022b2bdd..fef45120 100644 --- a/FluentAvalonia/Styling/StylesV2/LightResources.axaml +++ b/FluentAvalonia/Styling/StylesV2/LightResources.axaml @@ -1,211 +1,223 @@ - #E4000000 - #9E000000 - #72000000 - #5C000000 - #FFFFFF + - #5C000000 + #E4000000 + #9E000000 + #72000000 + #5C000000 + #FFFFFF - #FFFFFF + #5C000000 - #FFFFFF - #B3FFFFFF - #FFFFFF + #FFFFFF - #B3FFFFFF - #80F9F9F9 - #4DF9F9F9 - #4DF9F9F9 - #00FFFFFF - #FFFFFF + #FFFFFF + #B3FFFFFF + #FFFFFF - #72000000 - #51000000 + #B3FFFFFF + #80F9F9F9 + #4DF9F9F9 + #4DF9F9F9 + #00FFFFFF + #FFFFFF - #FFFFFF + #72000000 + #51000000 - #00FFFFFF - #09000000 - #06000000 - #00FFFFFF + #FFFFFF - #00FFFFFF - #06000000 - #0F000000 - #18000000 - #00FFFFFF + #00FFFFFF + #09000000 + #06000000 + #00FFFFFF - #C9FFFFFF - #F3F3F3 - #EBEBEB - #00FFFFFF + #00FFFFFF + #06000000 + #0F000000 + #18000000 + #00FFFFFF - #37000000 + #C9FFFFFF + #F3F3F3 + #EBEBEB + #00FFFFFF - #0F000000 - #29000000 - #14FFFFFF - #66000000 - #37000000 - #0F000000 + #37000000 - #59FFFFFF + #0F000000 + #29000000 + #14FFFFFF + #66000000 + #37000000 + #0F000000 - #0F000000 - #EBEBEB + #59FFFFFF - #72000000 - #37000000 + #0F000000 + #EBEBEB - #66757575 - #0F000000 - #15FFFFFF + #72000000 + #37000000 - #0F000000 + #66757575 + #0F000000 + #15FFFFFF - #E4000000 - #B3FFFFFF + #0F000000 - #B3FFFFFF - #80F6F6F6 + #E4000000 + #B3FFFFFF - #4D000000 + #B3FFFFFF + #80F6F6F6 - #80FFFFFF - #FFFFFF - #40FFFFFF - #40FFFFFF + #4D000000 - #F3F3F3 - #EEEEEE - #F9F9F9 - #FFFFFF + #80FFFFFF + #FFFFFF + #40FFFFFF + #40FFFFFF + + #F3F3F3 + #EEEEEE + #F9F9F9 + #FFFFFF #00F3F3F3 - - #0F7B0F - #9D5D00 - #C42B1C - #72000000 + + #0F7B0F + #9D5D00 + #C42B1C + #72000000 #8A8A8A - #80F6F6F6 - #DFF6DD - #FFF4CE - #FDE7E9 - #06000000 + #80F6F6F6 + #DFF6DD + #FFF4CE + #FDE7E9 + #06000000 #F7F7F7 #F3F3F3 - - - - - - - + - - - - + + + + + - + + + + - - - + - - - - - - + + + - - + + + + + + - + + - - - - + - - - - - + + + + - - - - + + + + + - + + + + - - - - + - - - - - - + + + + - + + + + + + - - + - - + + - - - + + - + + + - - + - - + + - + + - - - - + - - - - + + + + - - - - - + + + + + + + + + + - - - - - + + + + + - - + + + + + + + + + + + + @@ -228,261 +240,417 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + True + 1 + + 1,2,1,1 + 10,5,6,6 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + + + + + 1 + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 80 + 1 + 20 + 20 + 0,0,0,4 + Normal @@ -502,39 +670,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 80 + 1 + 1 + 0,0,0,4 + 0,0,20,0 + 20,0,0,0 + Normal @@ -554,27 +741,38 @@ - - - - - - - - - + + + + + + + + + + + + - - - - - - 0 - - - - - + + + + + + + + 0 + + + + + + + + + + @@ -607,68 +805,68 @@ + 1 + CharacterEllipsis + 0 + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 28,0,0,0 + 56,0,0,0 + + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - 1 + + + 0 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + 4 + 4 + 0 + 0,0,0,4 + Normal + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -772,354 +1038,408 @@ - - - - - - - - - - - - - - - - - - - - #5C010101 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + #5C010101 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + 12 + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 0 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + 1 + + 320 + 548 + 184 + 756 + + + 8 + 0,0,0,12 + 24 + 0,0,0,1 + + - - - - + + + + + + + + + 1 + + + 0 + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + 160 + 240 + 480 + 198 + + + + + 1 + + + + + + + + 1 + 0,0,0,1 + 0,1,0,0 + 0 + 0 + 0 + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + 1 + + + - - - - - - - - - - 1 - - - - - - - - - - - 0 - - - - - + + + + + + + + + + + 1 + + + + + + + + + + + 0 + + + + + + @@ -1144,34 +1464,41 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + @@ -1180,145 +1507,283 @@ + + + 0 + + + + + + + - - - - - - - - - - - - - - - - - + True + -40.5 + 0.3 + 0.80 + 0.80 + 0.50 + 0.95 + 10.0 + 4 + 88 + 40 + 4 + + + + + + + + + + + + + + + + + + + + + + + + + True + + + + + + + + + + + + + + + + + + 4 + 3 + 1.5 + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - 1 + + 1 - - - - - - - - - - - - - 1 + + + + + + + + + + + + + 1 + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 4,2 - 0,3,0,5 - 28 - 28 - 20 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 4,2 + 0,3,0,5 + 28 + 28 + 20 + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + 8 + 8 + 14 + 8 + 0,3,0,0 + 1,13,1,13 + 0 + 0 + 0,2,0,0 + 0,9,0,0 + 8,7,8,8 + 12,11.5,12,11.5 + 7,6,3,7 + 3,6,3,7 + 3,6,7,7 + -2 + SemiBold + SemiBold + Normal + + + + + - 0 - - - - + 0 + + + + + + @@ -1352,6 +1817,9 @@ 1,0,1,1 + + + 12,0,12,0 0.6 @@ -1385,6 +1853,19 @@ + + + + + 320 + 48 + 0,0,1,0 + 1,0,0,0 + + 00:00:00.2 + 00:00:00.19999 + 00:00:00.1 + 0 From 671cdc45b93e9ae8fa3be3e725b6b8685c28866b Mon Sep 17 00:00:00 2001 From: amwx Date: Tue, 12 Oct 2021 01:36:38 -0400 Subject: [PATCH 03/35] Update Control Templates --- .../BasicControls/AutoCompleteBox.axaml | 76 ++- .../Styling/BasicControls/AvComboBox.axaml | 36 +- .../Styling/BasicControls/ButtonSpinner.axaml | 12 - .../Styling/BasicControls/ButtonStyle.axaml | 58 +- .../Styling/BasicControls/Calendar.axaml | 553 +++++++++++------- .../BasicControls/CalendarDatePicker.axaml | 75 +-- .../Styling/BasicControls/CheckBoxStyle.axaml | 5 +- .../BasicControls/ContentControl.axaml | 3 +- .../Styling/BasicControls/DatePicker.axaml | 114 ++-- .../Styling/BasicControls/ExpanderStyle.axaml | 93 ++- .../Styling/BasicControls/GridSplitter.axaml | 8 +- .../Styling/BasicControls/ListBox.axaml | 62 +- .../Styling/BasicControls/MenuItemStyle.axaml | 30 +- .../Styling/BasicControls/MenuStyle.axaml | 9 +- .../BasicControls/OverlayPopupHost.axaml | 7 +- .../Styling/BasicControls/PopupRoot.axaml | 13 +- .../Styling/BasicControls/ProgressBar.axaml | 41 +- .../BasicControls/RadioButtonStyle.axaml | 8 +- .../BasicControls/RepeatButtonStyle.axaml | 12 +- .../BasicControls/ScrollBarStyle.axaml | 56 +- .../Styling/BasicControls/SliderStyle.axaml | 20 +- .../BasicControls/SplitViewStyle.axaml | 42 +- .../Styling/BasicControls/TabControl.axaml | 5 +- .../Styling/BasicControls/TextBoxStyle.axaml | 8 +- .../Styling/BasicControls/TimePicker.axaml | 26 +- .../BasicControls/ToggleButtonStyle.axaml | 9 +- .../BasicControls/ToggleSwitchStyle.axaml | 130 ++-- .../Styling/BasicControls/TreeView.axaml | 17 +- .../Styling/BasicControls/UserControl.axaml | 3 +- .../Styling/Controls/ButtonStyle.axaml | 131 ----- .../Styling/Controls/ColorPickerButton.axaml | 7 +- .../Styling/Controls/ColorPickerStyles.axaml | 15 +- .../Styling/Controls/ComboBox.axaml | 73 +-- .../Controls/CommandBar/CommandBar.axaml | 26 +- .../CommandBar/CommandBarButton.axaml | 10 +- .../CommandBarFlyoutCommandBar.axaml | 3 +- .../CommandBar/CommandBarToggleButton.axaml | 10 +- .../Styling/Controls/ContentDialogStyle.axaml | 19 +- .../Styling/Controls/DropDownButton.axaml | 5 +- .../Controls/FlyoutPresenterStyle.axaml | 3 +- .../Controls/HyperlinkButtonStyle.axaml | 3 +- FluentAvalonia/Styling/Controls/InfoBar.axaml | 11 +- .../Styling/Controls/MenuFlyoutItem.axaml | 9 +- .../Controls/MenuFlyoutSeparator.axaml | 5 +- .../Styling/Controls/MenuFlyoutSubItem.axaml | 5 +- .../NavigationView/NavigationView.axaml | 12 +- .../NavigationView/NavigationViewDeps.axaml | 1 + .../NavigationView/NavigationViewItem.axaml | 2 +- .../Styling/Controls/NumberBoxStyle.axaml | 12 +- .../Controls/PickerFlyoutPresenterStyle.axaml | 3 +- .../Controls/RadioMenuFlyoutItem.axaml | 5 +- .../Styling/Controls/SplitButtonStyle.axaml | 5 +- .../Controls/ToggleMenuFlyoutItem.axaml | 5 +- 53 files changed, 955 insertions(+), 956 deletions(-) delete mode 100644 FluentAvalonia/Styling/Controls/ButtonStyle.axaml diff --git a/FluentAvalonia/Styling/BasicControls/AutoCompleteBox.axaml b/FluentAvalonia/Styling/BasicControls/AutoCompleteBox.axaml index 42de6aa1..42fdad76 100644 --- a/FluentAvalonia/Styling/BasicControls/AutoCompleteBox.axaml +++ b/FluentAvalonia/Styling/BasicControls/AutoCompleteBox.axaml @@ -2,11 +2,27 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:ui="using:FluentAvalonia.UI.Controls"> + + + + + + + + - 374 - 0,2,0,2 - 1 - -1,0,-1,0 + 0,0,0,8 + 1,3 + 0,4 + + 0 2 + 374 + -1,0 + + + + - - @@ -254,32 +255,19 @@ - - - - - - - - - diff --git a/FluentAvalonia/Styling/BasicControls/ButtonSpinner.axaml b/FluentAvalonia/Styling/BasicControls/ButtonSpinner.axaml index 8c9fd1ac..55ed6108 100644 --- a/FluentAvalonia/Styling/BasicControls/ButtonSpinner.axaml +++ b/FluentAvalonia/Styling/BasicControls/ButtonSpinner.axaml @@ -21,18 +21,6 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/FluentAvalonia/Styling/BasicControls/Calendar.axaml b/FluentAvalonia/Styling/BasicControls/Calendar.axaml index d0a1001e..38197fa0 100644 --- a/FluentAvalonia/Styling/BasicControls/Calendar.axaml +++ b/FluentAvalonia/Styling/BasicControls/Calendar.axaml @@ -4,34 +4,10 @@ - + - - - - - + - - + + - + + + + - + - - + + - - + + + - - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -296,7 +359,10 @@ + FontWeight="{DynamicResource CalendarViewWeekDayFontWeight}" + Margin="{DynamicResource CalendarViewWeekDayMargin}" + Padding="{DynamicResource CalendarViewWeekDayPadding}" + Classes="CaptionTextBlockStyle"/> @@ -304,67 +370,115 @@ + CornerRadius="{TemplateBinding CornerRadius}"> + - + - - + + + + + + - - - - - - + + + - - + @@ -383,7 +497,7 @@ + Grid.Row="2" IsVisible="False"> @@ -403,9 +517,4 @@ - - - \ No newline at end of file diff --git a/FluentAvalonia/Styling/BasicControls/CalendarDatePicker.axaml b/FluentAvalonia/Styling/BasicControls/CalendarDatePicker.axaml index 9ad356fe..b377d2f5 100644 --- a/FluentAvalonia/Styling/BasicControls/CalendarDatePicker.axaml +++ b/FluentAvalonia/Styling/BasicControls/CalendarDatePicker.axaml @@ -19,7 +19,6 @@ - 1 0,0,0,8 @@ -31,7 +30,6 @@ - @@ -41,7 +39,7 @@ @@ -105,7 +70,7 @@ - - -