From 6370ae38de78ab9c4bafa343e8870ee6d531b49c Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Tue, 5 Jul 2022 21:58:26 -0400
Subject: [PATCH] Switch to TemplateBinding in ColorPicker where possible

---
 .../Themes/Fluent/ColorPicker.xaml            | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
index 878d7819eb..46d627b3a1 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
@@ -49,31 +49,31 @@
           <DropDownButton.Flyout>
             <Flyout FlyoutPresenterClasses="NoPadding">
               <ColorView x:Name="FlyoutColorView"
-                         Color="{Binding $parent[ColorPicker].Color, Mode=TwoWay}"
-                         ColorModel="{Binding $parent[ColorPicker].ColorModel, Mode=TwoWay}"
-                         ColorSpectrumComponents="{Binding $parent[ColorPicker].ColorSpectrumComponents}"
-                         ColorSpectrumShape="{Binding $parent[ColorPicker].ColorSpectrumShape}"
-                         HsvColor="{Binding $parent[ColorPicker].HsvColor, Mode=TwoWay}"
-                         IsAlphaEnabled="{Binding $parent[ColorPicker].IsAlphaEnabled}"
-                         IsAlphaVisible="{Binding $parent[ColorPicker].IsAlphaVisible}"
-                         IsColorComponentsVisible="{Binding $parent[ColorPicker].IsColorComponentsVisible}"
-                         IsColorPaletteVisible="{Binding $parent[ColorPicker].IsColorPaletteVisible}"
-                         IsColorPreviewVisible="{Binding $parent[ColorPicker].IsColorPreviewVisible}"
-                         IsColorSpectrumVisible="{Binding $parent[ColorPicker].IsColorSpectrumVisible}"
-                         IsColorSpectrumSliderVisible="{Binding $parent[ColorPicker].IsColorSpectrumSliderVisible}"
-                         IsComponentTextInputVisible="{Binding $parent[ColorPicker].IsComponentTextInputVisible}"
-                         IsHexInputVisible="{Binding $parent[ColorPicker].IsHexInputVisible}"
-                         MaxHue="{Binding $parent[ColorPicker].MaxHue}"
-                         MaxSaturation="{Binding $parent[ColorPicker].MaxSaturation}"
-                         MaxValue="{Binding $parent[ColorPicker].MaxValue}"
-                         MinHue="{Binding $parent[ColorPicker].MinHue}"
-                         MinSaturation="{Binding $parent[ColorPicker].MinSaturation}"
-                         MinValue="{Binding $parent[ColorPicker].MinValue}"
-                         PaletteColors="{Binding $parent[ColorPicker].PaletteColors}"
-                         PaletteColumnCount="{Binding $parent[ColorPicker].PaletteColumnCount}"
-                         Palette="{Binding $parent[ColorPicker].Palette}"
-                         SelectedIndex="{Binding $parent[ColorPicker].SelectedIndex, Mode=TwoWay}"
-                         ShowAccentColors="{Binding $parent[ColorPicker].ShowAccentColors}" />
+                         Color="{Binding Color, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                         ColorModel="{Binding ColorModel, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                         ColorSpectrumComponents="{TemplateBinding ColorSpectrumComponents}"
+                         ColorSpectrumShape="{TemplateBinding ColorSpectrumShape}"
+                         HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                         IsAlphaEnabled="{TemplateBinding IsAlphaEnabled}"
+                         IsAlphaVisible="{TemplateBinding IsAlphaVisible}"
+                         IsColorComponentsVisible="{TemplateBinding IsColorComponentsVisible}"
+                         IsColorPaletteVisible="{TemplateBinding IsColorPaletteVisible}"
+                         IsColorPreviewVisible="{TemplateBinding IsColorPreviewVisible}"
+                         IsColorSpectrumVisible="{TemplateBinding IsColorSpectrumVisible}"
+                         IsColorSpectrumSliderVisible="{TemplateBinding IsColorSpectrumSliderVisible}"
+                         IsComponentTextInputVisible="{TemplateBinding IsComponentTextInputVisible}"
+                         IsHexInputVisible="{TemplateBinding IsHexInputVisible}"
+                         MaxHue="{TemplateBinding MaxHue}"
+                         MaxSaturation="{TemplateBinding MaxSaturation}"
+                         MaxValue="{TemplateBinding MaxValue}"
+                         MinHue="{TemplateBinding MinHue}"
+                         MinSaturation="{TemplateBinding MinSaturation}"
+                         MinValue="{TemplateBinding MinValue}"
+                         PaletteColors="{TemplateBinding PaletteColors}"
+                         PaletteColumnCount="{TemplateBinding PaletteColumnCount}"
+                         Palette="{TemplateBinding Palette}"
+                         SelectedIndex="{Binding SelectedIndex, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                         ShowAccentColors="{TemplateBinding ShowAccentColors}" />
             </Flyout>
           </DropDownButton.Flyout>
         </DropDownButton>