From 2e961d1d700fe19020e3414a623cdb9baff17cae Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Mon, 25 Jan 2021 14:21:49 +0100
Subject: [PATCH] Colorpicker fixes (#9277)

Co-authored-by: Niels Laute <niels9001@hotmail.com>
---
 .../ColorPickerUI/Controls/ColorPickerControl.xaml          | 4 ++--
 .../ColorPickerUI/Controls/ColorPickerControl.xaml.cs       | 2 ++
 src/modules/colorPicker/ColorPickerUI/Resources/Styles.xaml | 6 ------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/modules/colorPicker/ColorPickerUI/Controls/ColorPickerControl.xaml b/src/modules/colorPicker/ColorPickerUI/Controls/ColorPickerControl.xaml
index bf1af9149d..31be42c401 100644
--- a/src/modules/colorPicker/ColorPickerUI/Controls/ColorPickerControl.xaml
+++ b/src/modules/colorPicker/ColorPickerUI/Controls/ColorPickerControl.xaml
@@ -274,14 +274,14 @@
                     <Button x:Name="CancelButton"
                             Click="CancelButton_Click"
                             AutomationProperties.Name="{x:Static p:Resources.Cancel}"
-                            Content="Cancel"
+                            Content="{x:Static p:Resources.Cancel}"
                             Width="80"/>
                     <Button Margin="12,0,12,0"
                             x:Name="OKButton"
                             Click="OKButton_Click"
                             Style="{StaticResource AccentButtonStyle}"
                             AutomationProperties.Name="{x:Static p:Resources.OK}"
-                            Content="OK"
+                            Content="{x:Static p:Resources.OK}"
                             Width="80"/>
                 </WrapPanel>
             </StackPanel>
diff --git a/src/modules/colorPicker/ColorPickerUI/Controls/ColorPickerControl.xaml.cs b/src/modules/colorPicker/ColorPickerUI/Controls/ColorPickerControl.xaml.cs
index ebd33aff68..0b9e0515b3 100644
--- a/src/modules/colorPicker/ColorPickerUI/Controls/ColorPickerControl.xaml.cs
+++ b/src/modules/colorPicker/ColorPickerUI/Controls/ColorPickerControl.xaml.cs
@@ -199,6 +199,7 @@ namespace ColorPicker.Controls
                 CurrentColorButton.BeginAnimation(Button.MarginProperty, moveColor);
                 detailsStackPanel.BeginAnimation(StackPanel.OpacityProperty, opacityAppear);
                 detailsGrid.BeginAnimation(Grid.HeightProperty, resize);
+                CurrentColorButton.IsEnabled = false;
             }
         }
 
@@ -226,6 +227,7 @@ namespace ColorPicker.Controls
                 detailsStackPanel.BeginAnimation(Window.OpacityProperty, opacityAppear);
                 detailsGrid.BeginAnimation(Grid.HeightProperty, resize);
                 detailsGrid.Visibility = Visibility.Collapsed;
+                CurrentColorButton.IsEnabled = true;
             }
         }
 
diff --git a/src/modules/colorPicker/ColorPickerUI/Resources/Styles.xaml b/src/modules/colorPicker/ColorPickerUI/Resources/Styles.xaml
index 89480b8e0c..a5945dcb0f 100644
--- a/src/modules/colorPicker/ColorPickerUI/Resources/Styles.xaml
+++ b/src/modules/colorPicker/ColorPickerUI/Resources/Styles.xaml
@@ -120,15 +120,9 @@
                             <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPressed}" />
                             <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundPressed}" />
                         </Trigger>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="Background" Property="Background" Value="{DynamicResource ButtonBackgroundDisabled}" />
-                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushDisabled}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundDisabled}" />
-                        </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
-
 </ResourceDictionary>
\ No newline at end of file