From b58b726f89061b2df5ff7b75ff7881fce1021ecb Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Mon, 20 Jun 2022 22:30:54 -0400
Subject: [PATCH] Set the CustomPalette property in XAML

---
 src/Avalonia.Controls.ColorPicker/ColorView/ColorView.cs       | 1 -
 src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls.ColorPicker/ColorView/ColorView.cs b/src/Avalonia.Controls.ColorPicker/ColorView/ColorView.cs
index 9809f1312b..b6e3e6df7d 100644
--- a/src/Avalonia.Controls.ColorPicker/ColorView/ColorView.cs
+++ b/src/Avalonia.Controls.ColorPicker/ColorView/ColorView.cs
@@ -34,7 +34,6 @@ namespace Avalonia.Controls
         /// </summary>
         public ColorView() : base()
         {
-            CustomPalette = new FluentColorPalette();
         }
 
         /// <summary>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
index 4b01de15a0..cf58b882e7 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
@@ -81,6 +81,9 @@
 
   <Style Selector="ColorView">
     <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+    <Setter Property="CustomPalette">
+      <local:FluentColorPalette />
+    </Setter>
     <Setter Property="Template">
       <ControlTemplate>
         <Grid RowDefinitions="Auto,Auto">