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

Updating UI and making it Fluent

Browse Source
This commit is contained in:
Niels Laute
2020-11-07 21:17:31 +01:00
parent 36fd030075
commit edbbc69f4f
11 changed files with 149 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,6 @@
<ResourceDictionary.MergedDictionaries>
<ui:ThemeResources />
<ui:XamlControlsResources />
<!-- Other merged dictionaries here -->
</ResourceDictionary.MergedDictionaries>
<ObjectDataProvider x:Key="ResizeFitValues"
@@ -21,6 +20,7 @@
<x:Type Type="{x:Type m:ResizeFit}"/>
</ObjectDataProvider.MethodParameters>
</ObjectDataProvider>
<ObjectDataProvider x:Key="ResizeUnitValues"
MethodName="GetValues"
ObjectType="sys:Enum">
@@ -28,58 +28,11 @@
<x:Type Type="{x:Type m:ResizeUnit}"/>
</ObjectDataProvider.MethodParameters>
</ObjectDataProvider>
<v:EnumValueConverter x:Key="EnumValueConverter"/>
<v:AutoDoubleConverter x:Key="AutoDoubleConverter"/>
<v:BoolValueConverter x:Key="BoolValueConverter"/>
<v:VisibilityBoolConverter x:Key="VisibilityBoolConverter"/>
<Style x:Key="MainInstructionTextBlockStyle" TargetType="TextBlock">
<Setter Property="FontSize" Value="12pt"/>
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HotTrackColor}}"/>
</Style>
<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>
</ResourceDictionary>
</Application.Resources>
</Application>