diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/Button.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/Button.cs index 07e009860..3e9cbb78a 100644 --- a/src/library/Uno.Themes.WinUI.Markup/Theme/Button.cs +++ b/src/library/Uno.Themes.WinUI.Markup/Theme/Button.cs @@ -88,8 +88,11 @@ public static partial class StateLayerBackground public static ThemeResourceKey PointerFocused => new("ElevatedButtonStateLayerBackgroundPointerFocused"); } - [ResourceKeyDefinition(typeof(Brush), "ElevatedButtonForeground")] - public static ThemeResourceKey Foreground => new("ElevatedButtonForeground"); + public static partial class Foreground + { + [ResourceKeyDefinition(typeof(Brush), "ElevatedButtonForeground")] + public static ThemeResourceKey Default => new("ElevatedButtonForeground"); + } [ResourceKeyDefinition(typeof(bool), "ElevatedButtonIsTintEnabled")] public static StaticResourceKey IsTintEnabled => new("ElevatedButtonIsTintEnabled"); @@ -157,8 +160,11 @@ public static partial class StateLayerBackground [ResourceKeyDefinition(typeof(double), "ButtonElevation")] public static ThemeResourceKey Elevation => new("ButtonElevation"); - [ResourceKeyDefinition(typeof(Brush), "FilledButtonForeground")] - public static ThemeResourceKey Foreground => new("FilledButtonForeground"); + public static partial class Foreground + { + [ResourceKeyDefinition(typeof(Brush), "FilledButtonForeground")] + public static ThemeResourceKey Default => new("FilledButtonForeground"); + } [ResourceKeyDefinition(typeof(Thickness), "ButtonMargin")] public static ThemeResourceKey Margin => new("ButtonMargin"); @@ -226,8 +232,11 @@ public static partial class StateLayerBackground [ResourceKeyDefinition(typeof(double), "ButtonElevation")] public static ThemeResourceKey Elevation => new("ButtonElevation"); - [ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonForeground")] - public static ThemeResourceKey Foreground => new("FilledTonalButtonForeground"); + public static partial class Foreground + { + [ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonForeground")] + public static ThemeResourceKey Default => new("FilledTonalButtonForeground"); + } [ResourceKeyDefinition(typeof(Thickness), "ButtonMargin")] public static ThemeResourceKey Margin => new("ButtonMargin"); @@ -253,20 +262,26 @@ public static partial class OpacityHiddenState public static ThemeResourceKey PointerOver => new("IconButtonOpacityVisibleState"); } - [ResourceKeyDefinition(typeof(Brush), "IconButtonEllipseFillFocused")] - public static ThemeResourceKey EllipseFillFocused => new("IconButtonEllipseFillFocused"); + public static partial class Fill + { + [ResourceKeyDefinition(typeof(Brush), "IconButtonEllipseFillFocused")] + public static ThemeResourceKey Focused => new("IconButtonEllipseFillFocused"); - [ResourceKeyDefinition(typeof(Brush), "IconButtonEllipseFillPointerOver")] - public static ThemeResourceKey EllipseFillPointerOver => new("IconButtonEllipseFillPointerOver"); + [ResourceKeyDefinition(typeof(Brush), "IconButtonEllipseFillPointerOver")] + public static ThemeResourceKey PointerOver => new("IconButtonEllipseFillPointerOver"); - [ResourceKeyDefinition(typeof(Brush), "IconButtonEllipseFillPressed")] - public static ThemeResourceKey EllipseFillPressed => new("IconButtonEllipseFillPressed"); + [ResourceKeyDefinition(typeof(Brush), "IconButtonEllipseFillPressed")] + public static ThemeResourceKey Pressed => new("IconButtonEllipseFillPressed"); + } - [ResourceKeyDefinition(typeof(Brush), "IconButtonForeground")] - public static ThemeResourceKey Foreground => new("IconButtonForeground"); + public static partial class Foreground + { + [ResourceKeyDefinition(typeof(Brush), "IconButtonForeground")] + public static ThemeResourceKey Default => new("IconButtonForeground"); - [ResourceKeyDefinition(typeof(Brush), "IconButtonForegroundDisabled")] - public static ThemeResourceKey ForegroundDisabled => new("IconButtonForegroundDisabled"); + [ResourceKeyDefinition(typeof(Brush), "IconButtonForegroundDisabled")] + public static ThemeResourceKey Disabled => new("IconButtonForegroundDisabled"); + } } public static partial class Outlined @@ -328,8 +343,11 @@ public static partial class StateLayerBackground [ResourceKeyDefinition(typeof(Thickness), "OutlinedButtonBorderThickness")] public static ThemeResourceKey BorderThickness => new("OutlinedButtonBorderThickness"); - [ResourceKeyDefinition(typeof(Brush), "OutlinedButtonForeground")] - public static ThemeResourceKey Foreground => new("OutlinedButtonForeground"); + public static partial class Foreground + { + [ResourceKeyDefinition(typeof(Brush), "OutlinedButtonForeground")] + public static ThemeResourceKey Default => new("OutlinedButtonForeground"); + } } public static partial class Text @@ -388,8 +406,11 @@ public static partial class StateLayerBackground public static ThemeResourceKey PointerFocused => new("TextButtonStateLayerBackgroundPointerFocused"); } - [ResourceKeyDefinition(typeof(Brush), "TextButtonForeground")] - public static ThemeResourceKey Foreground => new("TextButtonForeground"); + public static partial class Foreground + { + [ResourceKeyDefinition(typeof(Brush), "TextButtonForeground")] + public static ThemeResourceKey Default => new("TextButtonForeground"); + } [ResourceKeyDefinition(typeof(Thickness), "TextButtonPadding")] public static ThemeResourceKey Padding => new("TextButtonPadding"); diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/CalendarDatePicker.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/CalendarDatePicker.cs index e2472037a..8ad65b235 100644 --- a/src/library/Uno.Themes.WinUI.Markup/Theme/CalendarDatePicker.cs +++ b/src/library/Uno.Themes.WinUI.Markup/Theme/CalendarDatePicker.cs @@ -48,11 +48,14 @@ public static partial class BorderBrush public static partial class Header { - [ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerHeaderForeground")] - public static ThemeResourceKey Foreground => new("CalendarDatePickerHeaderForeground"); - - [ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerHeaderForegroundDisabled")] - public static ThemeResourceKey ForegroundDisabled => new("CalendarDatePickerHeaderForegroundDisabled"); + public static partial class Foreground + { + [ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerHeaderForeground")] + public static ThemeResourceKey Default => new("CalendarDatePickerHeaderForeground"); + + [ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerHeaderForegroundDisabled")] + public static ThemeResourceKey Disabled => new("CalendarDatePickerHeaderForegroundDisabled"); + } } public static partial class TextForeground @@ -67,6 +70,12 @@ public static partial class TextForeground public static ThemeResourceKey Selected => new("CalendarDatePickerTextForegroundSelected"); } + public static partial class BottomBorderBrush + { + [ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBottomBorderBrush")] + public static ThemeResourceKey Default => new("CalendarDatePickerBottomBorderBrush"); + } + [ResourceKeyDefinition(typeof(CornerRadius), "CalendarDatePickerBackgroundCornerRadius")] public static ThemeResourceKey BackgroundCornerRadius => new("CalendarDatePickerBackgroundCornerRadius"); @@ -76,11 +85,11 @@ public static partial class TextForeground [ResourceKeyDefinition(typeof(Thickness), "CalendarDatePickerBorderThemeThickness")] public static ThemeResourceKey BorderThemeThickness => new("CalendarDatePickerBorderThemeThickness"); - [ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBottomBorderBrush")] - public static ThemeResourceKey BottomBorderBrush => new("CalendarDatePickerBottomBorderBrush"); - - [ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerCalendarGlyphForegroundDisabled")] - public static ThemeResourceKey CalendarGlyphForegroundDisabled => new("CalendarDatePickerCalendarGlyphForegroundDisabled"); + public static partial class CalendarGlyphForeground + { + [ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerCalendarGlyphForegroundDisabled")] + public static ThemeResourceKey Disabled => new("CalendarDatePickerCalendarGlyphForegroundDisabled"); + } [ResourceKeyDefinition(typeof(Thickness), "CalendarDatePickerContentMargin")] public static ThemeResourceKey ContentMargin => new("CalendarDatePickerContentMargin"); @@ -88,8 +97,11 @@ public static partial class TextForeground [ResourceKeyDefinition(typeof(CornerRadius), "CalendarDatePickerCornerRadius")] public static ThemeResourceKey CornerRadius => new("CalendarDatePickerCornerRadius"); - [ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerForeground")] - public static ThemeResourceKey Foreground => new("CalendarDatePickerForeground"); + public static partial class Foreground + { + [ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerForeground")] + public static ThemeResourceKey Default => new("CalendarDatePickerForeground"); + } [ResourceKeyDefinition(typeof(double), "CalendarDatePickerHeight")] public static ThemeResourceKey Height => new("CalendarDatePickerHeight"); diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/ComboBox.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/ComboBox.cs index 07c2d13aa..a7448b74f 100644 --- a/src/library/Uno.Themes.WinUI.Markup/Theme/ComboBox.cs +++ b/src/library/Uno.Themes.WinUI.Markup/Theme/ComboBox.cs @@ -111,11 +111,17 @@ public static partial class Background public static ThemeResourceKey Unfocused => new("ComboBoxBackgroundUnfocused"); } - [ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBorderBrush")] - public static ThemeResourceKey BorderBrush => new("ComboBoxDropDownBorderBrush"); + public static partial class BorderBrush + { + [ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBorderBrush")] + public static ThemeResourceKey Default => new("ComboBoxDropDownBorderBrush"); + } - [ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownForeground")] - public static ThemeResourceKey Foreground => new("ComboBoxDropDownForeground"); + public static partial class Foreground + { + [ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownForeground")] + public static ThemeResourceKey Default => new("ComboBoxDropDownForeground"); + } } public static partial class Foreground diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs index 3305a6139..d3f37e4cc 100644 --- a/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs +++ b/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs @@ -93,19 +93,31 @@ public static partial class DateTextForeground public static class Flyout { - [ResourceKeyDefinition(typeof(Brush), "DatePickerFlyoutPresenterBackground")] - public static ThemeResourceKey Background => new("DatePickerFlyoutPresenterBackground"); + public static partial class Background + { + [ResourceKeyDefinition(typeof(Brush), "DatePickerFlyoutPresenterBackground")] + public static ThemeResourceKey Default => new("DatePickerFlyoutPresenterBackground"); + } - [ResourceKeyDefinition(typeof(Brush), "DatePickerFlyoutPresenterBorderBrush")] - public static ThemeResourceKey BorderBrush => new("DatePickerFlyoutPresenterBorderBrush"); + public static partial class BorderBrush + { + [ResourceKeyDefinition(typeof(Brush), "DatePickerFlyoutPresenterBorderBrush")] + public static ThemeResourceKey Default => new("DatePickerFlyoutPresenterBorderBrush"); + } - [ResourceKeyDefinition(typeof(Brush), "DatePickerFlyoutPresenterSpacerFill")] - public static ThemeResourceKey SpacerFill => new("DatePickerFlyoutPresenterSpacerFill"); + public static partial class SpacerFill + { + [ResourceKeyDefinition(typeof(Brush), "DatePickerFlyoutPresenterSpacerFill")] + public static ThemeResourceKey Default => new("DatePickerFlyoutPresenterSpacerFill"); + } - [ResourceKeyDefinition(typeof(Brush), "DatePickerFlyoutPresenterHighlightFill")] - public static ThemeResourceKey HighlightFill => new("DatePickerFlyoutPresenterHighlightFill"); + public static partial class HighlightFill + { + [ResourceKeyDefinition(typeof(Brush), "DatePickerFlyoutPresenterHighlightFill")] + public static ThemeResourceKey Default => new("DatePickerFlyoutPresenterHighlightFill"); + } - public static class Typography + public static partial class Typography { [ResourceKeyDefinition(typeof(FontFamily), "DatePickerFlyoutPresenterFontFamily")] public static ThemeResourceKey FontFamily => new("DatePickerFlyoutPresenterFontFamily"); @@ -114,21 +126,27 @@ public static class Typography public static ThemeResourceKey FontSize => new("DatePickerFlyoutPresenterFontSize"); } - [ResourceKeyDefinition(typeof(Brush), "DatePickerFlyoutButtonBackground")] - public static ThemeResourceKey ButtonBackground => new("DatePickerFlyoutButtonBackground"); - - public static class ButtonOpacity + public static partial class Button { - [ResourceKeyDefinition(typeof(double), "DatePickerFlyoutButtonOpacityPressed")] - public static ThemeResourceKey Pressed => new("DatePickerFlyoutButtonOpacityPressed"); - - [ResourceKeyDefinition(typeof(double), "DatePickerFlyoutButtonOpacityDisabled")] - public static ThemeResourceKey Disabled => new("DatePickerFlyoutButtonOpacityDisabled"); + public static partial class Background + { + [ResourceKeyDefinition(typeof(Brush), "DatePickerFlyoutButtonBackground")] + public static ThemeResourceKey Default => new("DatePickerFlyoutButtonBackground"); + } + + public static class Opacity + { + [ResourceKeyDefinition(typeof(double), "DatePickerFlyoutButtonOpacityPressed")] + public static ThemeResourceKey Pressed => new("DatePickerFlyoutButtonOpacityPressed"); + + [ResourceKeyDefinition(typeof(double), "DatePickerFlyoutButtonOpacityDisabled")] + public static ThemeResourceKey Disabled => new("DatePickerFlyoutButtonOpacityDisabled"); + } + + [ResourceKeyDefinition(typeof(Thickness), "DatePickerFlyoutButtonPadding")] + public static ThemeResourceKey Padding => new("DatePickerFlyoutButtonPadding"); } - [ResourceKeyDefinition(typeof(Thickness), "DatePickerFlyoutButtonPadding")] - public static ThemeResourceKey ButtonPadding => new("DatePickerFlyoutButtonPadding"); - [ResourceKeyDefinition(typeof(CornerRadius), "DatePickerFlyoutPresenterCornerRadius")] public static ThemeResourceKey CornerRadius => new("DatePickerFlyoutPresenterCornerRadius"); @@ -160,8 +178,11 @@ public static class ButtonOpacity [ResourceKeyDefinition(typeof(double), "DatePickerHeight")] public static ThemeResourceKey Height => new("DatePickerHeight"); - [ResourceKeyDefinition(typeof(Brush), "DatePickerPlaceholderTextForeground")] - public static ThemeResourceKey PlaceholderTextForeground => new("DatePickerPlaceholderTextForeground"); + public static partial class PlaceholderTextForeground + { + [ResourceKeyDefinition(typeof(Brush), "DatePickerPlaceholderTextForeground")] + public static ThemeResourceKey Default => new("DatePickerPlaceholderTextForeground"); + } } } diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/PasswordBox.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/PasswordBox.cs index bdd37536b..8be398db0 100644 --- a/src/library/Uno.Themes.WinUI.Markup/Theme/PasswordBox.cs +++ b/src/library/Uno.Themes.WinUI.Markup/Theme/PasswordBox.cs @@ -118,8 +118,11 @@ public static partial class LeadingIconForeground [ResourceKeyDefinition(typeof(Thickness), "FilledPasswordBoxPadding")] public static ThemeResourceKey Padding => new("FilledPasswordBoxPadding"); - [ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxRevealButtonForeground")] - public static ThemeResourceKey RevealButtonForeground => new("FilledPasswordBoxRevealButtonForeground"); + public static partial class RevealButtonForeground + { + [ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxRevealButtonForeground")] + public static ThemeResourceKey Default => new("FilledPasswordBoxRevealButtonForeground"); + } } public static partial class Outlined diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressBar.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressBar.cs index 44b548741..54e4131fb 100644 --- a/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressBar.cs +++ b/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressBar.cs @@ -13,11 +13,17 @@ public static partial class Resources { public static partial class Default { - [ResourceKeyDefinition(typeof(Brush), "ProgressBarBackground")] - public static ThemeResourceKey Background => new("ProgressBarBackground"); + public static partial class Background + { + [ResourceKeyDefinition(typeof(Brush), "ProgressBarBackground")] + public static ThemeResourceKey Default => new("ProgressBarBackground"); + } - [ResourceKeyDefinition(typeof(Brush), "ProgressBarForeground")] - public static ThemeResourceKey Foreground => new("ProgressBarForeground"); + public static partial class Foreground + { + [ResourceKeyDefinition(typeof(Brush), "ProgressBarForeground")] + public static ThemeResourceKey Default => new("ProgressBarForeground"); + } [ResourceKeyDefinition(typeof(double), "ProgressBarHeight")] public static ThemeResourceKey Height => new("ProgressBarHeight"); diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressRing.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressRing.cs index a912172ae..2e005eca5 100644 --- a/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressRing.cs +++ b/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressRing.cs @@ -13,11 +13,17 @@ public static partial class Resources { public static partial class Default { - [ResourceKeyDefinition(typeof(Brush), "ProgressRingBackground")] - public static ThemeResourceKey Background => new("ProgressRingBackground"); + public static partial class Background + { + [ResourceKeyDefinition(typeof(Brush), "ProgressRingBackground")] + public static ThemeResourceKey Default => new("ProgressRingBackground"); + } - [ResourceKeyDefinition(typeof(Brush), "ProgressRingForeground")] - public static ThemeResourceKey Foreground => new("ProgressRingForeground"); + public static partial class Foreground + { + [ResourceKeyDefinition(typeof(Brush), "ProgressRingForeground")] + public static ThemeResourceKey Default => new("ProgressRingForeground"); + } } } diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/RatingControl.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/RatingControl.cs index f55281bb6..a8e8f89a0 100644 --- a/src/library/Uno.Themes.WinUI.Markup/Theme/RatingControl.cs +++ b/src/library/Uno.Themes.WinUI.Markup/Theme/RatingControl.cs @@ -49,8 +49,11 @@ public static partial class Caption [ResourceKeyDefinition(typeof(FontFamily), "RatingControlCaptionFontFamily")] public static ThemeResourceKey FontFamily => new("RatingControlCaptionFontFamily"); - [ResourceKeyDefinition(typeof(Brush), "RatingControlCaptionForeground")] - public static ThemeResourceKey Foreground => new("RatingControlCaptionForeground"); + public static partial class Foreground + { + [ResourceKeyDefinition(typeof(Brush), "RatingControlCaptionForeground")] + public static ThemeResourceKey Default => new("RatingControlCaptionForeground"); + } [ResourceKeyDefinition(typeof(double), "RatingControlCaptionHeight")] public static ThemeResourceKey Height => new("RatingControlCaptionHeight"); @@ -107,8 +110,11 @@ public static partial class Caption [ResourceKeyDefinition(typeof(FontFamily), "SecondaryRatingControlCaptionFontFamily")] public static ThemeResourceKey FontFamily => new("SecondaryRatingControlCaptionFontFamily"); - [ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlCaptionForeground")] - public static ThemeResourceKey Foreground => new("SecondaryRatingControlCaptionForeground"); + public static partial class Foreground + { + [ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlCaptionForeground")] + public static ThemeResourceKey Default => new("SecondaryRatingControlCaptionForeground"); + } [ResourceKeyDefinition(typeof(double), "SecondaryRatingControlCaptionHeight")] public static ThemeResourceKey Height => new("SecondaryRatingControlCaptionHeight"); diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/Slider.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/Slider.cs index 188093981..0b65c7982 100644 --- a/src/library/Uno.Themes.WinUI.Markup/Theme/Slider.cs +++ b/src/library/Uno.Themes.WinUI.Markup/Theme/Slider.cs @@ -81,14 +81,20 @@ public static partial class Top public static ThemeResourceKey Margin => new("SliderTopTickBarMargin"); } - [ResourceKeyDefinition(typeof(double), "SliderHorizontalInlineTickBarHeight")] - public static ThemeResourceKey HorizontalInlineHeight => new("SliderHorizontalInlineTickBarHeight"); + public static partial class Inline + { + public static partial class Fill + { + [ResourceKeyDefinition(typeof(Brush), "SliderInlineTickBarFill")] + public static ThemeResourceKey Default => new("SliderInlineTickBarFill"); + } - [ResourceKeyDefinition(typeof(Brush), "SliderInlineTickBarFill")] - public static ThemeResourceKey InlineFill => new("SliderInlineTickBarFill"); + [ResourceKeyDefinition(typeof(double), "SliderHorizontalInlineTickBarHeight")] + public static ThemeResourceKey HorizontalHeight => new("SliderHorizontalInlineTickBarHeight"); - [ResourceKeyDefinition(typeof(double), "SliderVerticalInlineTickBarWidth")] - public static ThemeResourceKey VerticalInlineWidth => new("SliderVerticalInlineTickBarWidth"); + [ResourceKeyDefinition(typeof(double), "SliderVerticalInlineTickBarWidth")] + public static ThemeResourceKey VerticalWidth => new("SliderVerticalInlineTickBarWidth"); + } } public static partial class Track diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleButton.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleButton.cs index dcd95ca66..671d003e5 100644 --- a/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleButton.cs +++ b/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleButton.cs @@ -156,8 +156,11 @@ public static partial class Opacity public static ThemeResourceKey Focused => new("IconToggleButtonStateCircleOpacityFocused"); } - [ResourceKeyDefinition(typeof(Brush), "IconToggleButtonStateCircleFill")] - public static ThemeResourceKey Fill => new("IconToggleButtonStateCircleFill"); + public static partial class Fill + { + [ResourceKeyDefinition(typeof(Brush), "IconToggleButtonStateCircleFill")] + public static ThemeResourceKey Default => new("IconToggleButtonStateCircleFill"); + } } [ResourceKeyDefinition(typeof(Thickness), "IconToggleButtonBorderThickness")] @@ -316,8 +319,11 @@ public static partial class Typography [ResourceKeyDefinition(typeof(CornerRadius), "TextToggleButtonCornerRadius")] public static ThemeResourceKey CornerRadius => new("TextToggleButtonCornerRadius"); - [ResourceKeyDefinition(typeof(Brush), "TextToggleButtonFeedbackFocused")] - public static ThemeResourceKey FeedbackFocused => new("TextToggleButtonFeedbackFocused"); + public static partial class Feedback + { + [ResourceKeyDefinition(typeof(Brush), "TextToggleButtonFeedbackFocused")] + public static ThemeResourceKey Focused => new("TextToggleButtonFeedbackFocused"); + } [ResourceKeyDefinition(typeof(double), "TextToggleButtonMinHeight")] public static ThemeResourceKey MinHeight => new("TextToggleButtonMinHeight"); diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleSwitch.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleSwitch.cs index 2238e0b28..555abfe0d 100644 --- a/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleSwitch.cs +++ b/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleSwitch.cs @@ -180,15 +180,18 @@ public static partial class IconPresenterForeground public static partial class Thumb { + public static partial class Fill + { + [ResourceKeyDefinition(typeof(Brush), "ToggleSwitchThumb")] + public static ThemeResourceKey Default => new("ToggleSwitchThumb"); + + } [ResourceKeyDefinition(typeof(double), "MediumThumbSize")] public static ThemeResourceKey MediumSize => new("MediumThumbSize"); [ResourceKeyDefinition(typeof(double), "LargeThumbSize")] public static ThemeResourceKey LargeSize => new("LargeThumbSize"); - [ResourceKeyDefinition(typeof(Brush), "ToggleSwitchThumb")] - public static ThemeResourceKey Fill => new("ToggleSwitchThumb"); - [ResourceKeyDefinition(typeof(CornerRadius), "LargeThumbCornerRadius")] public static ThemeResourceKey LargeCornerRadius => new("LargeThumbCornerRadius"); }