From 4228b9a7721c93c3b70fe1e0bfdfb398b40bc3f0 Mon Sep 17 00:00:00 2001
From: yuyoyuppe <a.yuyoyuppe@gmail.com>
Date: Mon, 2 Nov 2020 16:11:51 +0300
Subject: [PATCH] ImageResizer: fix Color contrast of ComboBox

---
 src/modules/imageresizer/ui/App.xaml          | 40 +++++++++++++++++++
 .../imageresizer/ui/Views/InputPage.xaml      |  6 ++-
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/src/modules/imageresizer/ui/App.xaml b/src/modules/imageresizer/ui/App.xaml
index 0621880f87..8b64a919da 100644
--- a/src/modules/imageresizer/ui/App.xaml
+++ b/src/modules/imageresizer/ui/App.xaml
@@ -31,6 +31,46 @@
         <Style TargetType="TextBox">
             <Setter Property="VerticalContentAlignment" Value="Center"/>
         </Style>
+        <Style x:Key="AccessibleComboBoxStyle" TargetType="ComboBoxItem">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type ComboBoxItem}">
+                        <Border Name="SelectedItemBorder"
+                                Padding="2"
+                                SnapsToDevicePixels="true">
+                            <ContentPresenter />
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsSelected" Value="true">
+                                <Setter TargetName="SelectedItemBorder"
+                                        Property="Background"
+                                        Value="#FF91b9d8"/>
+                                <Setter Property="Foreground"
+                                        Value="Black" />
+                            </Trigger>
+                            <Trigger Property="IsHighlighted" Value="true">
+                                <Setter TargetName="SelectedItemBorder"
+                                        Property="Background"
+                                        Value="#FFdadada" />
+                                <Setter Property="Foreground"
+                                        Value="Black" />
+                            </Trigger>
+                            <MultiTrigger>
+                                <MultiTrigger.Conditions>
+                                    <Condition Property="IsSelected" Value="true" />
+                                    <Condition Property="IsHighlighted" Value="true" />
+                                </MultiTrigger.Conditions>
+                                <Setter TargetName="SelectedItemBorder"
+                                        Property="Background"
+                                        Value="#FF619ccb"/>
+                                <Setter Property="Foreground"
+                                        Value="Black" />
+                            </MultiTrigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
     </Application.Resources>
 
 </Application>
diff --git a/src/modules/imageresizer/ui/Views/InputPage.xaml b/src/modules/imageresizer/ui/Views/InputPage.xaml
index f12a37711a..ff9fa01895 100644
--- a/src/modules/imageresizer/ui/Views/InputPage.xaml
+++ b/src/modules/imageresizer/ui/Views/InputPage.xaml
@@ -55,7 +55,8 @@
                         <ComboBox Height="23"
                                   Margin="5,0,0,0"
                                   ItemsSource="{Binding Source={StaticResource ResizeFitValues}}"
-                                  SelectedItem="{Binding Fit}">
+                                  SelectedItem="{Binding Fit}"
+                                  ItemContainerStyle="{StaticResource AccessibleComboBoxStyle}">
                             <ComboBox.ItemTemplate>
                                 <DataTemplate DataType="{x:Type m:ResizeFit}">
                                     <ContentPresenter Content="{Binding Converter={StaticResource EnumValueConverter}}"/>
@@ -97,7 +98,8 @@
                         <ComboBox Height="23"
                                   Margin="7,0,0,0"
                                   ItemsSource="{Binding Source={StaticResource ResizeUnitValues}}"
-                                  SelectedItem="{Binding Unit}">
+                                  SelectedItem="{Binding Unit}"
+                                  ItemContainerStyle="{StaticResource AccessibleComboBoxStyle}">
                             <ComboBox.ItemTemplate>
                                 <DataTemplate DataType="{x:Type m:ResizeUnit}">
                                     <ContentPresenter Content="{Binding Converter={StaticResource EnumValueConverter}}"/>