- Adjust Checkbox Dark Mode

This commit is contained in:
DB p 2021-11-16 16:02:12 +09:00
parent 806045bc54
commit f473a7efb4
3 changed files with 22 additions and 12 deletions

View file

@ -665,8 +665,8 @@
x:Name="OuterEllipse"
Width="20"
Height="20"
Fill="#ededed"
Stroke="#858585"
Fill="{DynamicResource CustomRadioBackground}"
Stroke="{DynamicResource CustomRadioBorder}"
StrokeThickness="{DynamicResource RadioButtonBorderThemeThickness}"
UseLayoutRounding="False" />
<Ellipse
@ -730,8 +730,8 @@
<Setter TargetName="ContentPresenter" Property="Foreground" Value="{DynamicResource RadioButtonForegroundPointerOver}" />
<Setter TargetName="RootGrid" Property="Background" Value="{DynamicResource RadioButtonBackgroundPointerOver}" />
<Setter TargetName="RootGrid" Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrushPointerOver}" />
<Setter TargetName="OuterEllipse" Property="Stroke" Value="#858585" />
<Setter TargetName="OuterEllipse" Property="Fill" Value="#e5e5e5" />
<Setter TargetName="OuterEllipse" Property="Stroke" Value="{DynamicResource HoverCustomRadioBorder}" />
<Setter TargetName="OuterEllipse" Property="Fill" Value="{DynamicResource HoverCustomRadioBackground}" />
<Setter TargetName="CheckOuterEllipse" Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokePointerOver}" />
<Setter TargetName="CheckOuterEllipse" Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedFillPointerOver}" />
<Setter TargetName="CheckGlyph" Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphFillPointerOver}" />
@ -741,8 +741,8 @@
<Setter TargetName="ContentPresenter" Property="Foreground" Value="{DynamicResource RadioButtonForegroundPressed}" />
<Setter TargetName="RootGrid" Property="Background" Value="{DynamicResource RadioButtonBackgroundPressed}" />
<Setter TargetName="RootGrid" Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrushPressed}" />
<Setter TargetName="OuterEllipse" Property="Stroke" Value="#b4b4b4" />
<Setter TargetName="OuterEllipse" Property="Fill" Value="#dcdcdc" />
<Setter TargetName="OuterEllipse" Property="Stroke" Value="{DynamicResource PressedCustomRadioBorder}" />
<Setter TargetName="OuterEllipse" Property="Fill" Value="{DynamicResource PressedCustomRadioBackground}" />
<Setter TargetName="CheckOuterEllipse" Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokePressed}" />
<Setter TargetName="CheckOuterEllipse" Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedFillPressed}" />
<Setter TargetName="CheckGlyph" Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphFillPressed}" />

View file

@ -57,7 +57,12 @@
<Thickness x:Key="DisabledCustomButtonOutBorderThickness">0,0,0,0</Thickness>
<Thickness x:Key="DisabledCustomButtonInsideBorderThickness">1,1,1,1</Thickness>
<SolidColorBrush x:Key="CustomRadioBorder" Color="#999999" />
<SolidColorBrush x:Key="CustomRadioBackground" Color="#1d1d1d" />
<SolidColorBrush x:Key="HoverCustomRadioBorder" Color="#999999" />
<SolidColorBrush x:Key="HoverCustomRadioBackground" Color="#1d1d1d" />
<SolidColorBrush x:Key="PressedCustomRadioBorder" Color="#b4b4b4" />
<SolidColorBrush x:Key="PressedCustomRadioBackground" Color="#1d1d1d" />
<CornerRadius x:Key="ControlCornerRadius">2,2,2,2</CornerRadius>
<CornerRadius x:Key="OverlayCornerRadius">4,4,4,4</CornerRadius>
@ -1101,13 +1106,13 @@
<m:StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokePointerOver" ResourceKey="SystemAccentColorLight1Brush" />
<m:StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokePressed" ResourceKey="SystemAccentColorDark1Brush" />
<m:StaticResource x:Key="RadioButtonOuterEllipseCheckedStrokeDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
<m:StaticResource x:Key="RadioButtonOuterEllipseCheckedFill" ResourceKey="SystemControlHighlightAccentBrush" />
<m:StaticResource x:Key="RadioButtonOuterEllipseCheckedFill" ResourceKey="SystemAccentColorLight1Brush" />
<m:StaticResource x:Key="RadioButtonOuterEllipseCheckedFillPointerOver" ResourceKey="SystemAccentColorLight1Brush" />
<m:StaticResource x:Key="RadioButtonOuterEllipseCheckedFillPressed" ResourceKey="SystemAccentColorDark1Brush" />
<m:StaticResource x:Key="RadioButtonOuterEllipseCheckedFillDisabled" ResourceKey="SystemControlBackgroundBaseMediumLowBrush" />
<m:StaticResource x:Key="RadioButtonCheckGlyphFill" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
<m:StaticResource x:Key="RadioButtonCheckGlyphFillPointerOver" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
<m:StaticResource x:Key="RadioButtonCheckGlyphFillPressed" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
<m:StaticResource x:Key="RadioButtonCheckGlyphFill" ResourceKey="Color01B" />
<m:StaticResource x:Key="RadioButtonCheckGlyphFillPointerOver" ResourceKey="Color01B" />
<m:StaticResource x:Key="RadioButtonCheckGlyphFillPressed" ResourceKey="Color01B" />
<m:StaticResource x:Key="RadioButtonCheckGlyphFillDisabled" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
<m:StaticResource x:Key="RadioButtonCheckGlyphStroke" ResourceKey="SystemControlTransparentBrush" />
<m:StaticResource x:Key="RadioButtonCheckGlyphStrokePointerOver" ResourceKey="SystemControlTransparentBrush" />

View file

@ -57,7 +57,12 @@
<Thickness x:Key="DisabledCustomButtonOutBorderThickness">1,1,1,0</Thickness>
<Thickness x:Key="DisabledCustomButtonInsideBorderThickness">0,0,0,1</Thickness>
<SolidColorBrush x:Key="CustomRadioBorder" Color="#858585" />
<SolidColorBrush x:Key="CustomRadioBackground" Color="#ededed" />
<SolidColorBrush x:Key="HoverCustomRadioBorder" Color="#858585" />
<SolidColorBrush x:Key="HoverCustomRadioBackground" Color="#e5e5e5" />
<SolidColorBrush x:Key="PressedCustomRadioBorder" Color="#b4b4b4" />
<SolidColorBrush x:Key="PressedCustomRadioBackground" Color="#dcdcdc" />
<CornerRadius x:Key="ControlCornerRadius">2,2,2,2</CornerRadius>
<CornerRadius x:Key="OverlayCornerRadius">4,4,4,4</CornerRadius>