Skip to content

Fix RadioButton style #1522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix RadioButton style #1522

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
467ff93
Fix RadioButton issues
Nuklon Aug 26, 2025
cb54e3b
Update Light.xaml
Nuklon Aug 26, 2025
ad226f7
Update Dark.xaml
Nuklon Aug 26, 2025
c3fb82f
Update RadioButton.xaml
Nuklon Aug 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
121 changes: 89 additions & 32 deletions src/Wpf.Ui/Controls/RadioButton/RadioButton.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:system="clr-namespace:System;assembly=System.Runtime">

<system:Double x:Key="RadioButtonCheckGlyphSize">12</system:Double>
<system:Double x:Key="RadioButtonCheckGlyphSize">11</system:Double>
<system:Double x:Key="RadioButtonOuterEllipseSize">20</system:Double>
<!--
<system:Double x:Key="RadioButtonCheckGlyphPointerOverSize">14</system:Double>
<system:Double x:Key="RadioButtonCheckGlyphPressedOverSize">10</system:Double>-->
<system:Double x:Key="RadioButtonStrokeThickness">1</system:Double>
<Thickness x:Key="RadioButtonPadding">8,6,0,0</Thickness>
<Thickness x:Key="RadioButtonPadding">0,0,0,0</Thickness>
<Thickness x:Key="RadioButtonContentMargin">8,0,0,0</Thickness>

<Style x:Key="DefaultRadioButtonStyle" TargetType="{x:Type RadioButton}">
<!-- Universal WPF UI focus -->
Expand All @@ -30,11 +31,10 @@
<Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="Margin" Value="0" />
<Setter Property="Padding" Value="{StaticResource RadioButtonPadding}" />
<Setter Property="Cursor" Value="Hand" />
<Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="HorizontalContentAlignment" Value="Left" />
<Setter Property="VerticalContentAlignment" Value="Top" />
<Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
<Setter Property="FontWeight" Value="Normal" />
<Setter Property="MinWidth" Value="120" />
Expand All @@ -46,19 +46,22 @@
<Setter.Value>
<ControlTemplate TargetType="{x:Type RadioButton}">
<Grid
MinHeight="32"
Margin="{TemplateBinding Padding}"
HorizontalAlignment="Stretch"
VerticalAlignment="{TemplateBinding VerticalAlignment}"
Background="Transparent">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="20" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid Height="32" VerticalAlignment="Top">
<Grid Height="20">
<Ellipse
x:Name="OuterEllipse"
Width="{StaticResource RadioButtonOuterEllipseSize}"
Height="{StaticResource RadioButtonOuterEllipseSize}"
Fill="{DynamicResource RadioButtonOuterEllipseFill}"
SnapsToDevicePixels="False"
Stroke="{DynamicResource RadioButtonOuterEllipseStroke}"
StrokeThickness="{StaticResource RadioButtonStrokeThickness}"
UseLayoutRounding="False" />
Expand All @@ -69,6 +72,7 @@
Height="{StaticResource RadioButtonOuterEllipseSize}"
Fill="{TemplateBinding Background}"
Opacity="0"
SnapsToDevicePixels="False"
Stroke="{TemplateBinding Background}"
StrokeThickness="{StaticResource RadioButtonStrokeThickness}"
UseLayoutRounding="False" />
Expand All @@ -78,80 +82,70 @@
Height="{StaticResource RadioButtonCheckGlyphSize}"
Fill="{DynamicResource RadioButtonCheckGlyphFill}"
Opacity="0"
Stroke="{DynamicResource CircleElevationBorderBrush}"
SnapsToDevicePixels="False"
UseLayoutRounding="False">
<Ellipse.LayoutTransform>
<ScaleTransform ScaleX="1.0" ScaleY="1.0" />
</Ellipse.LayoutTransform>
</Ellipse>
<!-- A separate element is added since the two orthogonal state groups that cannot touch the same property -->
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also removed this, it's not needed.

<Border
x:Name="PressedCheckGlyph"
Width="4"
Height="4"
Background="{DynamicResource RadioButtonCheckGlyphFill}"
BorderBrush="{DynamicResource CircleElevationBorderBrush}"
CornerRadius="6"
Opacity="0"
UseLayoutRounding="False" />

</Grid>

<ContentPresenter
x:Name="ContentPresenter"
Grid.Column="1"
Margin="{TemplateBinding Padding}"
Margin="{StaticResource RadioButtonContentMargin}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}"
TextElement.Foreground="{TemplateBinding Foreground}" />
</Grid>
<ControlTemplate.Triggers>
<!-- Clunky, todo
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsMouseOver" Value="True" />
<Condition Property="IsChecked" Value="True" />
<Condition Property="IsEnabled" Value="True" />
</MultiTrigger.Conditions>
<MultiTrigger.EnterActions>
<BeginStoryboard>
<StopStoryboard BeginStoryboardName="IsPressedEnlarge" />
<StopStoryboard BeginStoryboardName="IsPressedReduce" />
<StopStoryboard BeginStoryboardName="IsPressedUndo" />
<BeginStoryboard Name="IsMouseOverEnlarge">
<Storyboard>
<DoubleAnimation
Storyboard.TargetName="CheckGlyph"
Storyboard.TargetProperty="(Ellipse.LayoutTransform).(ScaleTransform.ScaleY)"
From="1.0"
To="1.2"
Duration="00:00:00.167" />
<DoubleAnimation
Storyboard.TargetName="CheckGlyph"
Storyboard.TargetProperty="(Ellipse.LayoutTransform).(ScaleTransform.ScaleX)"
From="1.0"
To="1.2"
Duration="00:00:00.167" />
</Storyboard>
</BeginStoryboard>
</MultiTrigger.EnterActions>
<MultiTrigger.ExitActions>
<BeginStoryboard>
<StopStoryboard BeginStoryboardName="IsPressedEnlarge" />
<StopStoryboard BeginStoryboardName="IsPressedReduce" />
<StopStoryboard BeginStoryboardName="IsPressedUndo" />
<BeginStoryboard Name="IsMouseOverReduce">
<Storyboard>
<DoubleAnimation
Storyboard.TargetName="CheckGlyph"
Storyboard.TargetProperty="(Ellipse.LayoutTransform).(ScaleTransform.ScaleY)"
From="1.2"
To="1.0"
Duration="00:00:00.167" />
Duration="0" />
<DoubleAnimation
Storyboard.TargetName="CheckGlyph"
Storyboard.TargetProperty="(Ellipse.LayoutTransform).(ScaleTransform.ScaleX)"
From="1.2"
To="1.0"
Duration="00:00:00.167" />
Duration="0" />
</Storyboard>
</BeginStoryboard>
</MultiTrigger.ExitActions>
</MultiTrigger>
-->
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsPressed" Value="True" />
Expand All @@ -161,6 +155,72 @@
<Setter TargetName="CheckGlyph" Property="Opacity" Value="1.0" />
<Setter TargetName="OuterEllipse" Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillPressed}" />
<Setter TargetName="OuterEllipse" Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseStrokePressed}" />
<MultiTrigger.EnterActions>
<StopStoryboard BeginStoryboardName="IsMouseOverReduce" />
<StopStoryboard BeginStoryboardName="IsMouseOverEnlarge" />
<StopStoryboard BeginStoryboardName="IsPressedReduce" />
<StopStoryboard BeginStoryboardName="IsPressedUndo" />
<BeginStoryboard Name="IsPressedEnlarge">
<Storyboard>
<DoubleAnimation
Storyboard.TargetName="CheckGlyph"
Storyboard.TargetProperty="(Ellipse.LayoutTransform).(ScaleTransform.ScaleY)"
From="0.7"
To="1.0"
Duration="00:00:00.167" />
<DoubleAnimation
Storyboard.TargetName="CheckGlyph"
Storyboard.TargetProperty="(Ellipse.LayoutTransform).(ScaleTransform.ScaleX)"
From="0.7"
To="1.0"
Duration="00:00:00.167" />
</Storyboard>
</BeginStoryboard>
</MultiTrigger.EnterActions>
</MultiTrigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsPressed" Value="True" />
<Condition Property="IsChecked" Value="True" />
<Condition Property="IsEnabled" Value="True" />
</MultiTrigger.Conditions>
<MultiTrigger.EnterActions>
<StopStoryboard BeginStoryboardName="IsMouseOverReduce" />
<StopStoryboard BeginStoryboardName="IsMouseOverEnlarge" />
<StopStoryboard BeginStoryboardName="IsPressedEnlarge" />
<BeginStoryboard Name="IsPressedReduce">
<Storyboard>
<DoubleAnimation
Storyboard.TargetName="CheckGlyph"
Storyboard.TargetProperty="(Ellipse.LayoutTransform).(ScaleTransform.ScaleY)"
From="1.2"
To=".95"
Duration="00:00:00.167" />
<DoubleAnimation
Storyboard.TargetName="CheckGlyph"
Storyboard.TargetProperty="(Ellipse.LayoutTransform).(ScaleTransform.ScaleX)"
From="1.2"
To=".95"
Duration="00:00:00.167" />
</Storyboard>
</BeginStoryboard>
</MultiTrigger.EnterActions>
<MultiTrigger.ExitActions>
<BeginStoryboard Name="IsPressedUndo">
<Storyboard>
<DoubleAnimation
Storyboard.TargetName="CheckGlyph"
Storyboard.TargetProperty="(Ellipse.LayoutTransform).(ScaleTransform.ScaleY)"
To="1.2"
Duration="00:00:00.167" />
<DoubleAnimation
Storyboard.TargetName="CheckGlyph"
Storyboard.TargetProperty="(Ellipse.LayoutTransform).(ScaleTransform.ScaleX)"
To="1.2"
Duration="00:00:00.167" />
</Storyboard>
</BeginStoryboard>
</MultiTrigger.ExitActions>
</MultiTrigger>

<Trigger Property="IsChecked" Value="True">
Expand All @@ -186,8 +246,7 @@
<Condition Property="IsEnabled" Value="True" />
</MultiTrigger.Conditions>
<Setter TargetName="OuterEllipse" Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillPointerOver}" />
<!--<Setter TargetName="CheckGlyph" Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokePointerOver}" />-->
<Setter TargetName="PressedCheckGlyph" Property="Background" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokePointerOver}" />
<Setter Property="Background" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokePointerOver}" />
</MultiTrigger>
<MultiTrigger>
<MultiTrigger.Conditions>
Expand All @@ -207,8 +266,6 @@
<Setter Property="Foreground" Value="{DynamicResource RadioButtonForegroundDisabled}" />
<Setter TargetName="OuterEllipse" Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillDisabled}" />
<Setter TargetName="OuterEllipse" Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokeDisabled}" />


<Setter TargetName="CheckGlyph" Property="Opacity" Value="0.7" />
<Setter TargetName="CheckOuterEllipse" Property="Opacity" Value="0.7" />
</MultiTrigger>
Expand Down
2 changes: 1 addition & 1 deletion src/Wpf.Ui/Resources/Theme/Dark.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@
<SolidColorBrush x:Key="RadioButtonForeground" Color="{StaticResource TextFillColorPrimary}" />
<SolidColorBrush x:Key="RadioButtonForegroundDisabled" Color="{StaticResource TextFillColorDisabled}" />
<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStroke" Color="{DynamicResource SystemAccentColorPrimary}" />
<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStrokePointerOver" Color="{DynamicResource SystemAccentColorSecondary}" />
<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStrokePointerOver" Color="{DynamicResource AccentFillColorTertiary}" />
<SolidColorBrush x:Key="RadioButtonCheckGlyphFill" Color="{StaticResource TextOnAccentFillColorPrimary}" />
<SolidColorBrush x:Key="RadioButtonOuterEllipseFill" Color="{StaticResource ControlAltFillColorSecondary}" />
<SolidColorBrush x:Key="RadioButtonOuterEllipseFillPointerOver" Color="{StaticResource ControlAltFillColorTertiary}" />
Expand Down
2 changes: 1 addition & 1 deletion src/Wpf.Ui/Resources/Theme/Light.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@
<SolidColorBrush x:Key="RadioButtonForeground" Color="{StaticResource TextFillColorPrimary}" />
<SolidColorBrush x:Key="RadioButtonForegroundDisabled" Color="{StaticResource TextFillColorDisabled}" />
<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStroke" Color="{DynamicResource SystemAccentColorPrimary}" />
<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStrokePointerOver" Color="{DynamicResource SystemAccentColorSecondary}" />
<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStrokePointerOver" Color="{DynamicResource AccentFillColorTertiary}" />
<SolidColorBrush x:Key="RadioButtonCheckGlyphFill" Color="{StaticResource TextOnAccentFillColorPrimary}" />
<SolidColorBrush x:Key="RadioButtonOuterEllipseFill" Color="{StaticResource ControlAltFillColorSecondary}" />
<SolidColorBrush x:Key="RadioButtonOuterEllipseFillPointerOver" Color="{StaticResource ControlAltFillColorTertiary}" />
Expand Down