Skip to content

Commit 5473b98

Browse files
authored
Feature: Updated radio button design on the preview pane (#12571)
1 parent 2f9efb4 commit 5473b98

File tree

1 file changed

+39
-33
lines changed

1 file changed

+39
-33
lines changed

src/Files.App/UserControls/Pane/PreviewPane.xaml

Lines changed: 39 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -43,30 +43,32 @@
4343
<Setter Property="Template">
4444
<Setter.Value>
4545
<ControlTemplate TargetType="RadioButton">
46-
<Grid x:Name="RootGrid" Margin="0">
47-
<Grid.RowDefinitions>
48-
<RowDefinition Height="Auto" />
49-
<RowDefinition Height="4" />
50-
</Grid.RowDefinitions>
51-
<ContentPresenter
52-
x:Name="ContentPresenter"
53-
Grid.Row="0"
54-
Padding="12,4,12,4"
55-
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
56-
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
57-
AutomationProperties.AccessibilityView="Raw"
58-
Content="{TemplateBinding Content}"
59-
ContentTemplate="{TemplateBinding ContentTemplate}"
60-
ContentTransitions="{TemplateBinding ContentTransitions}"
61-
Foreground="{TemplateBinding Foreground}"
62-
TextWrapping="Wrap" />
63-
<Border
64-
x:Name="SelectionPill"
65-
Grid.Row="1"
66-
Height="2"
67-
Margin="16,0,16,0"
46+
<Grid x:Name="RootGrid">
47+
<Grid
48+
x:Name="ContainerGrid"
49+
Height="32"
6850
Background="Transparent"
69-
CornerRadius="2" />
51+
BorderThickness="1"
52+
CornerRadius="4">
53+
<ContentPresenter
54+
x:Name="ContentPresenter"
55+
Padding="16,0,16,0"
56+
HorizontalAlignment="Stretch"
57+
VerticalAlignment="Center"
58+
AutomationProperties.AccessibilityView="Raw"
59+
Content="{TemplateBinding Content}"
60+
ContentTemplate="{TemplateBinding ContentTemplate}"
61+
ContentTransitions="{TemplateBinding ContentTransitions}"
62+
TextWrapping="Wrap" />
63+
<Border
64+
x:Name="SelectionPill"
65+
Width="16"
66+
Height="3"
67+
HorizontalAlignment="Center"
68+
VerticalAlignment="Bottom"
69+
Background="Transparent"
70+
CornerRadius="1" />
71+
</Grid>
7072
<VisualStateManager.VisualStateGroups>
7173
<VisualStateGroup x:Name="CommonStates">
7274
<VisualState x:Name="Normal" />
@@ -77,13 +79,6 @@
7779
</ObjectAnimationUsingKeyFrames>
7880
</Storyboard>
7981
</VisualState>
80-
<VisualState x:Name="Pressed">
81-
<Storyboard>
82-
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
83-
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextFillColorPrimaryBrush}" />
84-
</ObjectAnimationUsingKeyFrames>
85-
</Storyboard>
86-
</VisualState>
8782
<VisualState x:Name="Disabled">
8883
<Storyboard>
8984
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
@@ -95,8 +90,14 @@
9590
<VisualStateGroup x:Name="CheckStates">
9691
<VisualState x:Name="Checked">
9792
<Storyboard>
93+
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContainerGrid" Storyboard.TargetProperty="Background">
94+
<DiscreteObjectKeyFrame KeyTime="0:0:00.3" Value="{ThemeResource ControlFillColorDefaultBrush}" />
95+
</ObjectAnimationUsingKeyFrames>
96+
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContainerGrid" Storyboard.TargetProperty="BorderBrush">
97+
<DiscreteObjectKeyFrame KeyTime="0:0:00.3" Value="{ThemeResource ControlElevationBorderBrush}" />
98+
</ObjectAnimationUsingKeyFrames>
9899
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SelectionPill" Storyboard.TargetProperty="Background">
99-
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemAccentColor}" />
100+
<DiscreteObjectKeyFrame KeyTime="0:0:00.3" Value="{ThemeResource SystemAccentColor}" />
100101
</ObjectAnimationUsingKeyFrames>
101102
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
102103
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextFillColorPrimaryBrush}" />
@@ -142,9 +143,14 @@
142143
Grid.Row="0"
143144
Grid.Column="0"
144145
Grid.ColumnSpan="2"
145-
Padding="12"
146-
HorizontalAlignment="Left"
146+
Margin="12"
147+
Padding="-1"
148+
HorizontalAlignment="Center"
147149
VerticalAlignment="Center"
150+
Background="{ThemeResource SubtleFillColorTertiaryBrush}"
151+
BorderBrush="{ThemeResource ControlStrokeColorDefaultBrush}"
152+
BorderThickness="1"
153+
CornerRadius="4"
148154
Orientation="Horizontal">
149155
<!-- Details -->
150156
<RadioButton

0 commit comments

Comments
 (0)