Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-09 04:37:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

ImageResizer: fix Color contrast of ComboBox

Browse Source
This commit is contained in:
yuyoyuppe
2020-11-02 16:11:51 +03:00
committed by Andrey Nekrasov
parent c103a8a205
commit 4228b9a772
2 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/modules/imageresizer/ui/App.xaml
View File

@@ -31,6 +31,46 @@
<Style TargetType="TextBox"> <Style TargetType="TextBox">
<Setter Property="VerticalContentAlignment" Value="Center"/> <Setter Property="VerticalContentAlignment" Value="Center"/>
</Style> </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.Resources>
</Application> </Application>

6
src/modules/imageresizer/ui/Views/InputPage.xaml
View File

@@ -55,7 +55,8 @@
<ComboBox Height="23" <ComboBox Height="23"
Margin="5,0,0,0" Margin="5,0,0,0"
ItemsSource="{Binding Source={StaticResource ResizeFitValues}}" ItemsSource="{Binding Source={StaticResource ResizeFitValues}}"
SelectedItem="{Binding Fit}"> SelectedItem="{Binding Fit}"
ItemContainerStyle="{StaticResource AccessibleComboBoxStyle}">
<ComboBox.ItemTemplate> <ComboBox.ItemTemplate>
<DataTemplate DataType="{x:Type m:ResizeFit}"> <DataTemplate DataType="{x:Type m:ResizeFit}">
<ContentPresenter Content="{Binding Converter={StaticResource EnumValueConverter}}"/> <ContentPresenter Content="{Binding Converter={StaticResource EnumValueConverter}}"/>
@@ -97,7 +98,8 @@
<ComboBox Height="23" <ComboBox Height="23"
Margin="7,0,0,0" Margin="7,0,0,0"
ItemsSource="{Binding Source={StaticResource ResizeUnitValues}}" ItemsSource="{Binding Source={StaticResource ResizeUnitValues}}"
SelectedItem="{Binding Unit}"> SelectedItem="{Binding Unit}"
ItemContainerStyle="{StaticResource AccessibleComboBoxStyle}">
<ComboBox.ItemTemplate> <ComboBox.ItemTemplate>
<DataTemplate DataType="{x:Type m:ResizeUnit}"> <DataTemplate DataType="{x:Type m:ResizeUnit}">
<ContentPresenter Content="{Binding Converter={StaticResource EnumValueConverter}}"/> <ContentPresenter Content="{Binding Converter={StaticResource EnumValueConverter}}"/>