Skip to content

Commit ba10e00

Browse files
authored
Merge pull request #1167 from unoplatform/dev/maso/correctingfontweight
2 parents aada1bf + fadfb01 commit ba10e00

22 files changed

+1539
-1470
lines changed

doc/lightweight-styling.md

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ All interactive controls have multiple states, such as **PointerOver** (mouse is
4343
For more information about the lightweight styling resource keys used in each control, check out the following links:
4444

4545
- [Button](styles/Button.md)
46+
- [CalendarDatePicker](styles/CalendarDatePicker.md)
4647
- [CheckBox](styles/CheckBox.md)
4748
- [ComboBox](styles/ComboBox.md)
4849
- [DatePicker](styles/DatePicker.md)

doc/material-controls-styles.md

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ PasswordBox|FilledPasswordBoxStyle|
4242
PasswordBox|OutlinedPasswordBoxStyle|True
4343
muxc:PipsPager|PipsPagerStyle|True
4444
RadioButton|RadioButtonStyle|True
45-
RadioButton|SecondaryRadioButtonStyle|
4645
RatingControl|RatingControlStyle|True
4746
RatingControl|SecondaryRatingControlStyle|
4847
Slider|SliderStyle|True

doc/styles/Button.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ TextButtonBorderBrushPressed|SolidColorBrush|SystemControlTransparentBrush
135135
TextButtonBorderBrushFocused|SolidColorBrush|SystemControlTransparentBrush
136136
TextButtonBorderBrushDisabled|SolidColorBrush|SystemControlTransparentBrush
137137
TextButtonBorderBrushPointerFocused|SolidColorBrush|SystemControlTransparentBrush
138-
IconButtonForeground|SolidColorBrush|OnSurfaceBrush
138+
IconButtonForeground|SolidColorBrush|OnSurfaceVariantBrush
139139
IconButtonForegroundDisabled|SolidColorBrush|OnSurfaceLowBrush
140140
IconButtonEllipseFillPointerOver|SolidColorBrush|PrimaryHoverBrush
141141
IconButtonEllipseFillPressed|SolidColorBrush|PrimaryPressedBrush

doc/styles/CheckBox.md

+61-32
Original file line numberDiff line numberDiff line change
@@ -15,39 +15,63 @@ CheckBoxBackgroundUnchecked|SolidColorBrush|SystemControlTransparentBrush
1515
CheckBoxBackgroundUncheckedPointerOver|SolidColorBrush|SystemControlTransparentBrush
1616
CheckBoxBackgroundUncheckedPressed|SolidColorBrush|SystemControlTransparentBrush
1717
CheckBoxBackgroundUncheckedDisabled|SolidColorBrush|SystemControlTransparentBrush
18-
CheckBoxBackgroundChecked|SolidColorBrush|PrimaryBrush
19-
CheckBoxBackgroundCheckedPointerOver|SolidColorBrush|PrimaryBrush
20-
CheckBoxBackgroundCheckedPressed|SolidColorBrush|PrimaryBrush
21-
CheckBoxBackgroundCheckedDisabled|SolidColorBrush|OnSurfaceLowBrush
22-
CheckBoxBackgroundIndeterminate|SolidColorBrush|PrimaryBrush
23-
CheckBoxBackgroundIndeterminatePointerOver|SolidColorBrush|PrimaryBrush
24-
CheckBoxBackgroundIndeterminatePressed|SolidColorBrush|PrimaryBrush
25-
CheckBoxBackgroundIndeterminateDisabled|SolidColorBrush|OnSurfaceLowBrush
26-
CheckBoxForegroundUnchecked|SolidColorBrush|OnSurfaceBrush
27-
CheckBoxForegroundUncheckedPointerOver|SolidColorBrush|OnSurfaceBrush
28-
CheckBoxForegroundUncheckedPressed|SolidColorBrush|OnSurfaceBrush
18+
CheckBoxBackgroundChecked|SolidColorBrush|SystemControlTransparentBrush
19+
CheckBoxBackgroundCheckedPointerOver|SolidColorBrush|SystemControlTransparentBrush
20+
CheckBoxBackgroundCheckedPressed|SolidColorBrush|SystemControlTransparentBrush
21+
CheckBoxBackgroundCheckedDisabled|SolidColorBrush|SystemControlTransparentBrush
22+
CheckBoxBackgroundIndeterminate|SolidColorBrush|SystemControlTransparentBrush
23+
CheckBoxBackgroundIndeterminatePointerOver|SolidColorBrush|SystemControlTransparentBrush
24+
CheckBoxBackgroundIndeterminatePressed|SolidColorBrush|SystemControlTransparentBrush
25+
CheckBoxBackgroundIndeterminateDisabled|SolidColorBrush|SystemControlTransparentBrush
26+
CheckBoxForegroundUnchecked|SolidColorBrush|OnSurfaceVariantBrush
27+
CheckBoxForegroundUncheckedPointerOver|SolidColorBrush|OnSurfaceVariantBrush
28+
CheckBoxForegroundUncheckedPressed|SolidColorBrush|OnSurfaceVariantBrush
2929
CheckBoxForegroundUncheckedDisabled|SolidColorBrush|OnSurfaceLowBrush
30-
CheckBoxForegroundChecked|SolidColorBrush|OnSurfaceBrush
31-
CheckBoxForegroundCheckedPointerOver|SolidColorBrush|OnSurfaceBrush
32-
CheckBoxForegroundCheckedPressed|SolidColorBrush|OnSurfaceBrush
30+
CheckBoxForegroundChecked|SolidColorBrush|OnSurfaceVariantBrush
31+
CheckBoxForegroundCheckedPointerOver|SolidColorBrush|OnSurfaceVariantBrush
32+
CheckBoxForegroundCheckedPressed|SolidColorBrush|OnSurfaceVariantBrush
3333
CheckBoxForegroundCheckedDisabled|SolidColorBrush|OnSurfaceLowBrush
34-
CheckBoxForegroundIndeterminate|SolidColorBrush|OnSurfaceBrush
35-
CheckBoxForegroundIndeterminatePointerOver|SolidColorBrush|OnSurfaceBrush
36-
CheckBoxForegroundIndeterminatePressed|SolidColorBrush|OnSurfaceBrush
34+
CheckBoxForegroundIndeterminate|SolidColorBrush|OnSurfaceVariantBrush
35+
CheckBoxForegroundIndeterminatePointerOver|SolidColorBrush|OnSurfaceVariantBrush
36+
CheckBoxForegroundIndeterminatePressed|SolidColorBrush|OnSurfaceVariantBrush
3737
CheckBoxForegroundIndeterminateDisabled|SolidColorBrush|OnSurfaceLowBrush
38-
CheckBoxBorderBrushUnchecked|SolidColorBrush|OnSurfaceBrush
39-
CheckBoxBorderBrushUncheckedPointerOver|SolidColorBrush|OnSurfaceBrush
40-
CheckBoxBorderBrushUncheckedPressed|SolidColorBrush|OnSurfaceBrush
41-
CheckBoxBorderBrushUncheckedDisabled|SolidColorBrush|OnSurfaceLowBrush
42-
CheckBoxBorderBrushChecked|SolidColorBrush|PrimaryBrush
43-
CheckBoxBorderBrushCheckedPointerOver|SolidColorBrush|PrimaryBrush
44-
CheckBoxBorderBrushCheckedPressed|SolidColorBrush|PrimaryBrush
45-
CheckBoxBorderBrushCheckedDisabled|SolidColorBrush|OnSurfaceLowBrush
46-
CheckBoxBorderBrushIndeterminate|SolidColorBrush|PrimaryBrush
47-
CheckBoxBorderBrushIndeterminatePointerOver|SolidColorBrush|PrimaryBrush
48-
CheckBoxBorderBrushIndeterminatePressed|SolidColorBrush|PrimaryBrush
49-
CheckBoxBorderBrushIndeterminateDisabled|SolidColorBrush|OnSurfaceLowBrush
50-
CheckBoxFontFamily|FontFamily|MaterialRegularFontFamily
38+
CheckBoxBorderBrushUnchecked|SolidColorBrush|SystemControlTransparentBrush
39+
CheckBoxBorderBrushUncheckedPointerOver|SolidColorBrush|SystemControlTransparentBrush
40+
CheckBoxBorderBrushUncheckedPressed|SolidColorBrush|SystemControlTransparentBrush
41+
CheckBoxBorderBrushUncheckedDisabled|SolidColorBrush|SystemControlTransparentBrush
42+
CheckBoxBorderBrushChecked|SolidColorBrush|SystemControlTransparentBrush
43+
CheckBoxBorderBrushCheckedPointerOver|SolidColorBrush|SystemControlTransparentBrush
44+
CheckBoxBorderBrushCheckedPressed|SolidColorBrush|SystemControlTransparentBrush
45+
CheckBoxBorderBrushCheckedDisabled|SolidColorBrush|SystemControlTransparentBrush
46+
CheckBoxBorderBrushIndeterminate|SolidColorBrush|SystemControlTransparentBrush
47+
CheckBoxBorderBrushIndeterminatePointerOver|SolidColorBrush|SystemControlTransparentBrush
48+
CheckBoxBorderBrushIndeterminatePressed|SolidColorBrush|SystemControlTransparentBrush
49+
CheckBoxBorderBrushIndeterminateDisabled|SolidColorBrush|SystemControlTransparentBrush
50+
CheckBoxCheckBackgroundStrokeUnchecked|SolidColorBrush|OnSurfaceVariantBrush
51+
CheckBoxCheckBackgroundStrokeUncheckedPointerOver|SolidColorBrush|OnSurfaceBrush
52+
CheckBoxCheckBackgroundStrokeUncheckedPressed|SolidColorBrush|OnSurfaceBrush
53+
CheckBoxCheckBackgroundStrokeUncheckedDisabled|SolidColorBrush|OnSurfaceLowBrush
54+
CheckBoxCheckBackgroundStrokeChecked|SolidColorBrush|PrimaryBrush
55+
CheckBoxCheckBackgroundStrokeCheckedPointerOver|SolidColorBrush|PrimaryBrush
56+
CheckBoxCheckBackgroundStrokeCheckedPressed|SolidColorBrush|PrimaryBrush
57+
CheckBoxCheckBackgroundStrokeCheckedDisabled|SolidColorBrush|OnSurfaceLowBrush
58+
CheckBoxCheckBackgroundStrokeIndeterminate|SolidColorBrush|PrimaryBrush
59+
CheckBoxCheckBackgroundStrokeIndeterminatePointerOver|SolidColorBrush|PrimaryBrush
60+
CheckBoxCheckBackgroundStrokeIndeterminatePressed|SolidColorBrush|PrimaryBrush
61+
CheckBoxCheckBackgroundStrokeIndeterminateDisabled|SolidColorBrush|OnSurfaceLowBrush
62+
CheckBoxCheckBackgroundFillUnchecked|SolidColorBrush|SystemControlTransparentBrush
63+
CheckBoxCheckBackgroundFillUncheckedPointerOver|SolidColorBrush|SystemControlTransparentBrush
64+
CheckBoxCheckBackgroundFillUncheckedPressed|SolidColorBrush|SystemControlTransparentBrush
65+
CheckBoxCheckBackgroundFillUncheckedDisabled|SolidColorBrush|SystemControlTransparentBrush
66+
CheckBoxCheckBackgroundFillChecked|SolidColorBrush|PrimaryBrush
67+
CheckBoxCheckBackgroundFillCheckedPointerOver|SolidColorBrush|PrimaryBrush
68+
CheckBoxCheckBackgroundFillCheckedPressed|SolidColorBrush|PrimaryBrush
69+
CheckBoxCheckBackgroundFillCheckedDisabled|SolidColorBrush|OnSurfaceLowBrush
70+
CheckBoxCheckBackgroundFillIndeterminate|SolidColorBrush|PrimaryBrush
71+
CheckBoxCheckBackgroundFillIndeterminatePointerOver|SolidColorBrush|PrimaryBrush
72+
CheckBoxCheckBackgroundFillIndeterminatePressed|SolidColorBrush|PrimaryBrush
73+
CheckBoxCheckBackgroundFillIndeterminateDisabled|SolidColorBrush|OnSurfaceLowBrush
74+
CheckBoxFontFamily|FontFamily|MaterialMediumFontFamily
5175
CheckBoxFontWeight|String|BodySmallFontWeight
5276
CheckBoxFontSize|Double|BodySmallFontSize
5377
CheckBoxCharacterSpacing|Int32|BodySmallCharacterSpacing
@@ -58,13 +82,18 @@ CheckBoxGlyphForegroundUncheckedDisabled|SolidColorBrush|SystemControlTransparen
5882
CheckBoxGlyphForegroundChecked|SolidColorBrush|OnPrimaryBrush
5983
CheckBoxGlyphForegroundCheckedPointerOver|SolidColorBrush|OnPrimaryBrush
6084
CheckBoxGlyphForegroundCheckedPressed|SolidColorBrush|OnPrimaryBrush
61-
CheckBoxGlyphForegroundCheckedDisabled|SolidColorBrush|OnPrimaryMediumBrush
85+
CheckBoxGlyphForegroundCheckedDisabled|SolidColorBrush|OnPrimaryBrush
6286
CheckBoxGlyphForegroundIndeterminate|SolidColorBrush|OnPrimaryBrush
6387
CheckBoxGlyphForegroundIndeterminatePointerOver|SolidColorBrush|OnPrimaryBrush
6488
CheckBoxGlyphForegroundIndeterminatePressed|SolidColorBrush|OnPrimaryBrush
65-
CheckBoxGlyphForegroundIndeterminateDisabled|SolidColorBrush|OnPrimaryMediumBrush
89+
CheckBoxGlyphForegroundIndeterminateDisabled|SolidColorBrush|OnPrimaryBrush
6690
CheckBoxHyphenGlyphPathData|String|M0,0L32,0 32,5.3 0,5.3z
6791
CheckBoxCheckGlyphPathData|String|M28.718018,0L32,3.2819897 10.666016,24.616999 0,13.951997 3.2810059,10.670007 10.666016,18.055033z
92+
CheckBoxStateCircleFillUnchecked|SolidColorBrush|OnSurfaceBrush
93+
CheckBoxStateCircleFillChecked|SolidColorBrush|PrimaryBrush
94+
CheckBoxStateCircleOpacityPointerOver|Double|HoverOpacity
95+
CheckBoxStateCircleOpacityPressed|Double|PressedOpacity
96+
CheckBoxStateCircleOpacityFocused|Double|FocusedOpacity
6897
CheckBoxFocusAreaSize|Double|40
6998
CheckBoxCheckAreaSize|Double|18
7099
CheckBoxCheckAreaLength|GridLength|40

doc/styles/ComboBox.md

+22-16
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ ComboBoxItemBorderBrushSelectedUnfocused|SolidColorBrush|SystemControlTransparen
3838
ComboBoxItemBorderBrushSelectedPressed|SolidColorBrush|SystemControlTransparentBrush
3939
ComboBoxItemBorderBrushSelectedPointerOver|SolidColorBrush|SystemControlTransparentBrush
4040
ComboBoxItemBorderBrushSelectedDisabled|SolidColorBrush|SystemControlTransparentBrush
41-
ComboBoxBorderBrush|SolidColorBrush|OnSurfaceLowBrush
42-
ComboBoxBorderBrushPointerOver|SolidColorBrush|OnSurfaceLowBrush
43-
ComboBoxBorderBrushPressed|SolidColorBrush|OnSurfaceLowBrush
44-
ComboBoxBorderBrushDisabled|SolidColorBrush|OnSurfaceLowBrush
41+
ComboBoxBorderBrush|SolidColorBrush|OutlineBrush
42+
ComboBoxBorderBrushPointerOver|SolidColorBrush|OnSurfaceBrush
43+
ComboBoxBorderBrushPressed|SolidColorBrush|OnSurfaceBrush
44+
ComboBoxBorderBrushDisabled|SolidColorBrush|OnSurfaceDisabledBrush
4545
ComboBoxBorderBrushOpened|SolidColorBrush|PrimaryBrush
4646
ComboBoxDropDownGlyphForeground|SolidColorBrush|SystemControlTransparentBrush
4747
ComboBoxDropDownGlyphForegroundDisabled|SolidColorBrush|SystemControlTransparentBrush
@@ -66,21 +66,27 @@ ComboBoxBackgroundFocused|SolidColorBrush|SystemControlTransparentBrush
6666
ComboBoxBackgroundFocusedPressed|SolidColorBrush|SystemControlTransparentBrush
6767
ComboBoxForeground|SolidColorBrush|OnSurfaceBrush
6868
ComboBoxForegroundPointerOver|SolidColorBrush|OnSurfaceBrush
69-
ComboBoxForegroundPressed|SolidColorBrush|OnSurfaceLowBrush
69+
ComboBoxForegroundPressed|SolidColorBrush|OnSurfaceBrush
7070
ComboBoxForegroundDisabled|SolidColorBrush|OnSurfaceLowBrush
71-
ComboBoxForegroundFocused|SolidColorBrush|OnSurfaceLowBrush
72-
ComboBoxForegroundFocusedPressed|SolidColorBrush|OnSurfaceLowBrush
73-
ComboBoxPlaceHolderForeground|SolidColorBrush|OnSurfaceLowBrush
74-
ComboBoxPlaceHolderForegroundPointerOver|SolidColorBrush|OnSurfaceLowBrush
75-
ComboBoxPlaceHolderForegroundPressed|SolidColorBrush|OnSurfaceLowBrush
71+
ComboBoxForegroundFocused|SolidColorBrush|OnSurfaceBrush
72+
ComboBoxForegroundFocusedPressed|SolidColorBrush|OnSurfaceBrush
73+
ComboBoxPlaceHolderForeground|SolidColorBrush|OnSurfaceVariantBrush
74+
ComboBoxPlaceHolderForegroundPointerOver|SolidColorBrush|OnSurfaceVariantBrush
75+
ComboBoxPlaceHolderForegroundPressed|SolidColorBrush|OnSurfaceVariantBrush
7676
ComboBoxPlaceHolderForegroundDisabled|SolidColorBrush|OnSurfaceLowBrush
77-
ComboBoxPlaceHolderForegroundFocused|SolidColorBrush|OnSurfaceLowBrush
78-
ComboBoxPlaceHolderForegroundFocusedPressed|SolidColorBrush|OnSurfaceLowBrush
79-
ComboBoxLeadingIconForeground|SolidColorBrush|OnSurfaceBrush
77+
ComboBoxPlaceHolderForegroundFocused|SolidColorBrush|OnSurfaceVariantBrush
78+
ComboBoxPlaceHolderForegroundFocusedPressed|SolidColorBrush|OnSurfaceVariantBrush
79+
ComboBoxLeadingIconForeground|SolidColorBrush|OnSurfaceVariantBrush
8080
ComboBoxLeadingIconForegroundDisabled|SolidColorBrush|OnSurfaceLowBrush
81-
ComboBoxArrowForeground|SolidColorBrush|OnSurfaceBrush
82-
ComboBoxArrowForegroundOpened|SolidColorBrush|PrimaryBrush
83-
ComboBoxUpperPlaceHolderForeground|SolidColorBrush|PrimaryBrush
81+
ComboBoxArrowForeground|SolidColorBrush|OnSurfaceVariantBrush
82+
ComboBoxArrowForegroundOpened|SolidColorBrush|OnSurfaceVariantBrush
83+
ComboBoxUpperPlaceHolderForeground|SolidColorBrush|OnSurfaceVariantBrush
84+
ComboBoxUpperPlaceHolderForegroundPointerOver|SolidColorBrush|OnSurfaceVariantBrush
85+
ComboBoxUpperPlaceHolderForegroundPressed|SolidColorBrush|OnSurfaceVariantBrush
86+
ComboBoxUpperPlaceHolderForegroundDisabled|SolidColorBrush|OnSurfaceLowBrush
87+
ComboBoxUpperPlaceHolderForegroundFocused|SolidColorBrush|PrimaryBrush
88+
ComboBoxUpperPlaceHolderForegroundFocusedPressed|SolidColorBrush|PrimaryBrush
89+
ComboBoxUpperPlaceHolderForegroundOpened|SolidColorBrush|PrimaryBrush
8490
ComboBoxCornerRadius|CornerRadius|4
8591
ComboBoxHeight|Double|50
8692
ComboBoxMinHeight|Double|56

doc/styles/PasswordBox.md

+10-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# PasswordBox Control
1+
# PasswordBox Control
22
## Styles
33

44
Style Key|IsDefaultStyle*
@@ -14,20 +14,23 @@ Key|Type|Value
1414
-|-|-
1515
PasswordBoxRevealGlyphPathData|String|`M11 0.5C6 0.5 1.73 3.61 0 8C1.73 12.39 6 15.5 11 15.5C16 15.5 20.27 12.39 22 8C20.27 3.61 16 0.5 11 0.5ZM11 13C8.24 13 6 10.76 6 8C6 5.24 8.24 3 11 3C13.76 3 16 5.24 16 8C16 10.76 13.76 13 11 13ZM11 5C9.34 5 8 6.34 8 8C8 9.66 9.34 11 11 11C12.66 11 14 9.66 14 8C14 6.34 12.66 5 11 5Z`
1616
PasswordBoxRevealButtonForeground|SolidColorBrush|OnSurfaceVariantBrush
17+
PasswordBoxLeadingIconForeground|SolidColorBrush|OnSurfaceVariantBrush
18+
PasswordBoxLeadingIconForegroundDisabled|SolidColorBrush|OnSurfaceLowBrush
1719
FilledPasswordBoxBackground|SolidColorBrush|SurfaceVariantBrush
1820
FilledPasswordBoxBackgroundPointerOver|SolidColorBrush|OnSurfaceVariantHoverBrush
1921
FilledPasswordBoxBackgroundFocused|SolidColorBrush|SurfaceVariantBrush
20-
FilledPasswordBoxBackgroundDisabled|SolidColorBrush|BackgroundDisabledLowBrush
22+
FilledPasswordBoxBackgroundDisabled|SolidColorBrush|OnSurfaceDisabledBrush
2123
FilledPasswordBoxBorderBrush|SolidColorBrush|OnSurfaceVariantBrush
2224
FilledPasswordBoxBorderBrushPointerOver|SolidColorBrush|OnSurfaceBrush
2325
FilledPasswordBoxBorderBrushFocused|SolidColorBrush|PrimaryBrush
24-
FilledPasswordBoxBorderBrushDisabled|SolidColorBrush|OnSurfaceDisabledLowBrush
26+
FilledPasswordBoxBorderBrushDisabled|SolidColorBrush|OnSurfaceDisabledBrush
2527
FilledPasswordBoxForeground|SolidColorBrush|OnSurfaceBrush
2628
FilledPasswordBoxForegroundPointerOver|SolidColorBrush|OnSurfaceBrush
2729
FilledPasswordBoxForegroundFocused|SolidColorBrush|OnSurfaceBrush
28-
FilledPasswordBoxForegroundDisabled|SolidColorBrush|OnSurfaceDisabledBrush
30+
FilledPasswordBoxForegroundDisabled|SolidColorBrush|OnSurfaceBrush
31+
FilledPasswordBoxForegroundOpacityDisabled|Double|LowOpacity
2932
FilledPasswordBoxPlaceholderForeground|SolidColorBrush|OnSurfaceVariantBrush
30-
FilledPasswordBoxPlaceholderForegroundPointerOver|SolidColorBrush|OnSurfaceBrush
33+
FilledPasswordBoxPlaceholderForegroundPointerOver|SolidColorBrush|OnSurfaceVariantBrush
3134
FilledPasswordBoxPlaceholderForegroundFocused|SolidColorBrush|PrimaryBrush
3235
FilledPasswordBoxPlaceholderForegroundDisabled|SolidColorBrush|OnSurfaceLowBrush
3336
FilledPasswordBoxRevealButtonForeground|SolidColorBrush|OnSurfaceVariantBrush
@@ -46,7 +49,8 @@ OutlinedPasswordBoxBorderBrushDisabled|SolidColorBrush|OnSurfaceDisabledLowBrush
4649
OutlinedPasswordBoxForeground|SolidColorBrush|OnSurfaceBrush
4750
OutlinedPasswordBoxForegroundPointerOver|SolidColorBrush|OnSurfaceBrush
4851
OutlinedPasswordBoxForegroundFocused|SolidColorBrush|OnSurfaceBrush
49-
OutlinedPasswordBoxForegroundDisabled|SolidColorBrush|OnSurfaceDisabledBrush
52+
OutlinedPasswordBoxForegroundDisabled|SolidColorBrush|OnSurfaceBrush
53+
OutlinedPasswordBoxForegroundOpacityDisabled|Double|LowOpacity
5054
OutlinedPasswordBoxPlaceholderForeground|SolidColorBrush|OnSurfaceVariantBrush
5155
OutlinedPasswordBoxPlaceholderForegroundPointerOver|SolidColorBrush|OnSurfaceBrush
5256
OutlinedPasswordBoxPlaceholderForegroundFocused|SolidColorBrush|PrimaryBrush

doc/styles/RadioButton.md

+16-14
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,39 @@
44
Style Key|IsDefaultStyle*
55
-|-
66
RadioButtonStyle|True
7-
SecondaryRadioButtonStyle|
87

98
IsDefaultStyle*: Styles in this column will be set as the default implicit style for the matching control
109

1110
## Lightweight Styling
1211

1312
Key|Type|Value
1413
-|-|-
15-
RadioButtonForeground|SolidColorBrush|OnBackgroundMediumBrush
16-
RadioButtonForegroundPointerOver|SolidColorBrush|OnBackgroundMediumBrush
17-
RadioButtonForegroundPressed|SolidColorBrush|OnBackgroundMediumBrush
18-
RadioButtonForegroundDisabled|SolidColorBrush|OnBackgroundDisabledBrush
19-
RadioButtonOuterEllipseStroke|SolidColorBrush|OnBackgroundMediumBrush
20-
RadioButtonOuterEllipseStrokePointerOver|SolidColorBrush|OnBackgroundMediumBrush
21-
RadioButtonOuterEllipseStrokePressed|SolidColorBrush|OnBackgroundMediumBrush
22-
RadioButtonOuterEllipseStrokeDisabled|SolidColorBrush|OnBackgroundDisabledBrush
14+
RadioButtonForeground|SolidColorBrush|OnSurfaceVariantBrush
15+
RadioButtonForegroundPointerOver|SolidColorBrush|OnSurfaceVariantBrush
16+
RadioButtonForegroundPressed|SolidColorBrush|OnSurfaceVariantBrush
17+
RadioButtonForegroundDisabled|SolidColorBrush|OnSurfaceLowBrush
18+
RadioButtonOuterEllipseStroke|SolidColorBrush|OnSurfaceVariantBrush
19+
RadioButtonOuterEllipseStrokePointerOver|SolidColorBrush|OnSurfaceBrush
20+
RadioButtonOuterEllipseStrokePressed|SolidColorBrush|OnSurfaceBrush
21+
RadioButtonOuterEllipseStrokeDisabled|SolidColorBrush|OnSurfaceLowBrush
2322
RadioButtonOuterEllipseCheckedStroke|SolidColorBrush|PrimaryBrush
2423
RadioButtonOuterEllipseCheckedStrokePointerOver|SolidColorBrush|PrimaryBrush
2524
RadioButtonOuterEllipseCheckedStrokePressed|SolidColorBrush|PrimaryBrush
26-
RadioButtonOuterEllipseCheckedStrokeDisabled|SolidColorBrush|PrimaryBrush
25+
RadioButtonOuterEllipseCheckedStrokeDisabled|SolidColorBrush|OnSurfaceLowBrush
2726
RadioButtonOuterEllipseFill|SolidColorBrush|SystemControlTransparentBrush
2827
RadioButtonOuterEllipseFillPointerOver|SolidColorBrush|SystemControlTransparentBrush
2928
RadioButtonOuterEllipseFillPressed|SolidColorBrush|SystemControlTransparentBrush
3029
RadioButtonOuterEllipseFillDisabled|SolidColorBrush|SystemControlTransparentBrush
3130
RadioButtonOuterEllipseCheckedFill|SolidColorBrush|PrimaryBrush
3231
RadioButtonOuterEllipseCheckedFillPointerOver|SolidColorBrush|PrimaryBrush
3332
RadioButtonOuterEllipseCheckedFillPressed|SolidColorBrush|PrimaryBrush
34-
RadioButtonOuterEllipseCheckedFillDisabled|SolidColorBrush|PrimaryBrush
35-
MaterialRadioButtonHoverRingFillPointerOver|SolidColorBrush|PrimaryHoverBrush
36-
MaterialRadioButtonHoverRingFillPressed|SolidColorBrush|PrimaryFocusedBrush
37-
RadioButtonFontFamily|FontFamily|MaterialRegularFontFamily
33+
RadioButtonOuterEllipseCheckedFillDisabled|SolidColorBrush|OnSurfaceLowBrush
34+
RadioButtonStateCircleBackgroundUnchecked|SolidColorBrush|OnSurfaceBrush
35+
RadioButtonStateCircleBackgroundChecked|SolidColorBrush|PrimaryBrush
36+
RadioButtonStateCircleOpacityPointerOver|Double|HoverOpacity
37+
RadioButtonStateCircleOpacityPressed|Double|PressedOpacity
38+
RadioButtonStateCircleOpacityFocused|Double|FocusedOpacity
39+
RadioButtonFontFamily|FontFamily|MaterialMediumFontFamily
3840
RadioButtonFontWeight|String|BodySmallFontWeight
3941
RadioButtonFontSize|Double|BodySmallFontSize
4042
RadioButtonCharacterSpacing|Int32|BodySmallCharacterSpacing

0 commit comments

Comments
 (0)