From be3e716e587e342d4bc34b1d974c54cbe42bc4f1 Mon Sep 17 00:00:00 2001 From: xiaoy312 Date: Wed, 11 Oct 2023 16:26:56 -0400 Subject: [PATCH] wip --- .../Uno.Themes.WinUI.Markup/Theme/Button.cs | 24 ++-- .../Theme/CalendarDatePicker.cs | 30 ++-- .../Uno.Themes.WinUI.Markup/Theme/CheckBox.cs | 28 ++-- .../Uno.Themes.WinUI.Markup/Theme/ComboBox.cs | 14 +- .../Theme/ContentDialog.cs | 32 ++--- .../Theme/DatePicker.cs | 20 +-- .../Theme/FloatingActionButton.cs | 24 ++-- .../Theme/MediaPlayerElement.cs | 18 +-- .../Theme/PasswordBox.cs | 12 +- .../Theme/RadioButton.cs | 22 +-- .../Uno.Themes.WinUI.Markup/Theme/Slider.cs | 134 +++++++++--------- .../Uno.Themes.WinUI.Markup/Theme/TextBox.cs | 44 +++--- .../Theme/ToggleButton.cs | 24 ++-- .../Theme/ToggleSwitch.cs | 22 +-- 14 files changed, 227 insertions(+), 221 deletions(-) diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/Button.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/Button.cs index 29e09298a..643874436 100644 --- a/src/library/Uno.Themes.WinUI.Markup/Theme/Button.cs +++ b/src/library/Uno.Themes.WinUI.Markup/Theme/Button.cs @@ -81,14 +81,14 @@ public static partial class StateLayerBackground [ResourceKeyDefinition(typeof(double), "ElevatedButtonElevation")] public static ThemeResourceKey Elevation => new("ElevatedButtonElevation"); + [ResourceKeyDefinition(typeof(double), "ElevatedButtonElevationDisabled")] + public static ThemeResourceKey ElevationDisabled => new("ElevatedButtonElevationDisabled"); + [ResourceKeyDefinition(typeof(Brush), "ElevatedButtonForeground")] public static ThemeResourceKey Foreground => new("ElevatedButtonForeground"); [ResourceKeyDefinition(typeof(bool), "ElevatedButtonIsTintEnabled")] public static StaticResourceKey IsTintEnabled => new("ElevatedButtonIsTintEnabled"); - - [ResourceKeyDefinition(typeof(double), "ElevatedButtonElevationDisabled")] - public static ThemeResourceKey ElevationDisabled => new("ElevatedButtonElevationDisabled"); } public static partial class Filled { @@ -146,12 +146,12 @@ public static partial class StateLayerBackground [ResourceKeyDefinition(typeof(Brush), "FilledButtonStateLayerBackgroundPressed")] public static ThemeResourceKey Pressed => new("FilledButtonStateLayerBackgroundPressed"); } - [ResourceKeyDefinition(typeof(Brush), "FilledButtonForeground")] - public static ThemeResourceKey Foreground => new("FilledButtonForeground"); - [ResourceKeyDefinition(typeof(double), "ButtonElevation")] public static ThemeResourceKey Elevation => new("ButtonElevation"); + [ResourceKeyDefinition(typeof(Brush), "FilledButtonForeground")] + public static ThemeResourceKey Foreground => new("FilledButtonForeground"); + [ResourceKeyDefinition(typeof(Thickness), "ButtonMargin")] public static ThemeResourceKey Margin => new("ButtonMargin"); } @@ -211,12 +211,12 @@ public static partial class StateLayerBackground [ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonStateLayerBackgroundPressed")] public static ThemeResourceKey Pressed => new("FilledTonalButtonStateLayerBackgroundPressed"); } - [ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonForeground")] - public static ThemeResourceKey Foreground => new("FilledTonalButtonForeground"); - [ResourceKeyDefinition(typeof(double), "ButtonElevation")] public static ThemeResourceKey Elevation => new("ButtonElevation"); + [ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonForeground")] + public static ThemeResourceKey Foreground => new("FilledTonalButtonForeground"); + [ResourceKeyDefinition(typeof(Thickness), "ButtonMargin")] public static ThemeResourceKey Margin => new("ButtonMargin"); } @@ -238,9 +238,6 @@ public static partial class OpacityHiddenState [ResourceKeyDefinition(typeof(double), "IconButtonOpacityVisibleState")] public static ThemeResourceKey PointerOver => new("IconButtonOpacityVisibleState"); } - [ResourceKeyDefinition(typeof(Brush), "IconButtonForeground")] - public static ThemeResourceKey Foreground => new("IconButtonForeground"); - [ResourceKeyDefinition(typeof(Brush), "IconButtonEllipseFillFocused")] public static ThemeResourceKey EllipseFillFocused => new("IconButtonEllipseFillFocused"); @@ -250,6 +247,9 @@ public static partial class OpacityHiddenState [ResourceKeyDefinition(typeof(Brush), "IconButtonEllipseFillPressed")] public static ThemeResourceKey EllipseFillPressed => new("IconButtonEllipseFillPressed"); + [ResourceKeyDefinition(typeof(Brush), "IconButtonForeground")] + public static ThemeResourceKey Foreground => new("IconButtonForeground"); + [ResourceKeyDefinition(typeof(Brush), "IconButtonForegroundDisabled")] public static ThemeResourceKey ForegroundDisabled => new("IconButtonForegroundDisabled"); } diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/CalendarDatePicker.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/CalendarDatePicker.cs index 66d8ff542..7dff4f05e 100644 --- a/src/library/Uno.Themes.WinUI.Markup/Theme/CalendarDatePicker.cs +++ b/src/library/Uno.Themes.WinUI.Markup/Theme/CalendarDatePicker.cs @@ -64,32 +64,32 @@ public static partial class TextForeground [ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerTextForegroundSelected")] public static ThemeResourceKey Selected => new("CalendarDatePickerTextForegroundSelected"); } - [ResourceKeyDefinition(typeof(Thickness), "CalendarDatePickerBorderThemeThickness")] - public static ThemeResourceKey BorderThemeThickness => new("CalendarDatePickerBorderThemeThickness"); - - [ResourceKeyDefinition(typeof(CornerRadius), "CalendarDatePickerCornerRadius")] - public static ThemeResourceKey CornerRadius => new("CalendarDatePickerCornerRadius"); - - [ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerForeground")] - public static ThemeResourceKey Foreground => new("CalendarDatePickerForeground"); - - [ResourceKeyDefinition(typeof(double), "CalendarDatePickerHeight")] - public static ThemeResourceKey Height => new("CalendarDatePickerHeight"); - - [ResourceKeyDefinition(typeof(Thickness), "CalendarDatePickerContentMargin")] - public static ThemeResourceKey ContentMargin => new("CalendarDatePickerContentMargin"); - [ResourceKeyDefinition(typeof(CornerRadius), "CalendarDatePickerBackgroundCornerRadius")] public static ThemeResourceKey BackgroundCornerRadius => new("CalendarDatePickerBackgroundCornerRadius"); [ResourceKeyDefinition(typeof(double), "CalendarDatePickerBackgroundMinHeight")] public static ThemeResourceKey BackgroundMinHeight => new("CalendarDatePickerBackgroundMinHeight"); + [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"); + + [ResourceKeyDefinition(typeof(Thickness), "CalendarDatePickerContentMargin")] + public static ThemeResourceKey ContentMargin => new("CalendarDatePickerContentMargin"); + + [ResourceKeyDefinition(typeof(CornerRadius), "CalendarDatePickerCornerRadius")] + public static ThemeResourceKey CornerRadius => new("CalendarDatePickerCornerRadius"); + + [ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerForeground")] + public static ThemeResourceKey Foreground => new("CalendarDatePickerForeground"); + + [ResourceKeyDefinition(typeof(double), "CalendarDatePickerHeight")] + public static ThemeResourceKey Height => new("CalendarDatePickerHeight"); } public static partial class Styles { diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/CheckBox.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/CheckBox.cs index bbfb7b03f..2a841d924 100644 --- a/src/library/Uno.Themes.WinUI.Markup/Theme/CheckBox.cs +++ b/src/library/Uno.Themes.WinUI.Markup/Theme/CheckBox.cs @@ -155,12 +155,24 @@ public static partial class StateCircleOpacityPointerOver [ResourceKeyDefinition(typeof(int), "CheckBoxCharacterSpacing")] public static ThemeResourceKey CharacterSpacing => new("CheckBoxCharacterSpacing"); + [ResourceKeyDefinition(typeof(Thickness), "CheckBoxCheckAreaBorderThickness")] + public static ThemeResourceKey CheckAreaBorderThickness => new("CheckBoxCheckAreaBorderThickness"); + [ResourceKeyDefinition(typeof(CornerRadius), "CheckBoxCheckAreaCornerRadius")] public static ThemeResourceKey CheckAreaCornerRadius => new("CheckBoxCheckAreaCornerRadius"); [ResourceKeyDefinition(typeof(Thickness), "CheckBoxCheckAreaPadding")] public static ThemeResourceKey CheckAreaPadding => new("CheckBoxCheckAreaPadding"); + [ResourceKeyDefinition(typeof(double), "CheckBoxCheckAreaSize")] + public static ThemeResourceKey CheckAreaSize => new("CheckBoxCheckAreaSize"); + + [ResourceKeyDefinition(typeof(string), "CheckBoxCheckGlyphPathData")] + public static ThemeResourceKey CheckGlyphPathData => new("CheckBoxCheckGlyphPathData"); + + [ResourceKeyDefinition(typeof(double), "CheckBoxFocusAreaSize")] + public static ThemeResourceKey FocusAreaSize => new("CheckBoxFocusAreaSize"); + [ResourceKeyDefinition(typeof(FontFamily), "CheckBoxFontFamily")] public static ThemeResourceKey FontFamily => new("CheckBoxFontFamily"); @@ -173,23 +185,11 @@ public static partial class StateCircleOpacityPointerOver [ResourceKeyDefinition(typeof(Brush), "CheckBoxForegroundUnchecked")] public static ThemeResourceKey ForegroundUnchecked => new("CheckBoxForegroundUnchecked"); - [ResourceKeyDefinition(typeof(double), "CheckBoxFocusAreaSize")] - public static ThemeResourceKey FocusAreaSize => new("CheckBoxFocusAreaSize"); - - [ResourceKeyDefinition(typeof(double), "CheckBoxCheckAreaSize")] - public static ThemeResourceKey CheckAreaSize => new("CheckBoxCheckAreaSize"); + [ResourceKeyDefinition(typeof(string), "CheckBoxHyphenGlyphPathData")] + public static ThemeResourceKey HyphenGlyphPathData => new("CheckBoxHyphenGlyphPathData"); [ResourceKeyDefinition(typeof(double), "CheckBoxStateCircleOpacityFocused")] public static ThemeResourceKey StateCircleOpacityFocused => new("CheckBoxStateCircleOpacityFocused"); - - [ResourceKeyDefinition(typeof(Thickness), "CheckBoxCheckAreaBorderThickness")] - public static ThemeResourceKey CheckAreaBorderThickness => new("CheckBoxCheckAreaBorderThickness"); - - [ResourceKeyDefinition(typeof(string), "CheckBoxCheckGlyphPathData")] - public static ThemeResourceKey CheckGlyphPathData => new("CheckBoxCheckGlyphPathData"); - - [ResourceKeyDefinition(typeof(string), "CheckBoxHyphenGlyphPathData")] - public static ThemeResourceKey HyphenGlyphPathData => new("CheckBoxHyphenGlyphPathData"); } public static partial class Styles { diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/ComboBox.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/ComboBox.cs index 4e5a3e192..5828869c1 100644 --- a/src/library/Uno.Themes.WinUI.Markup/Theme/ComboBox.cs +++ b/src/library/Uno.Themes.WinUI.Markup/Theme/ComboBox.cs @@ -202,21 +202,21 @@ public static partial class UpperPlaceHolderForeground [ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundPressed")] public static ThemeResourceKey Pressed => new("ComboBoxUpperPlaceHolderForegroundPressed"); } + [ResourceKeyDefinition(typeof(CornerRadius), "ComboBoxCornerRadius")] + public static ThemeResourceKey CornerRadius => new("ComboBoxCornerRadius"); + + [ResourceKeyDefinition(typeof(string), "ComboBoxDownArrowPathData")] + public static StaticResourceKey DownArrowPathData => new("ComboBoxDownArrowPathData"); + + [ResourceKeyDefinition(typeof(double), "ComboBoxMinHeight")] public static ThemeResourceKey MinHeight => new("ComboBoxMinHeight"); [ResourceKeyDefinition(typeof(Thickness), "ComboBoxPadding")] public static ThemeResourceKey Padding => new("ComboBoxPadding"); - - [ResourceKeyDefinition(typeof(string), "ComboBoxDownArrowPathData")] - public static StaticResourceKey DownArrowPathData => new("ComboBoxDownArrowPathData"); - [ResourceKeyDefinition(typeof(string), "ComboBoxUpArrowPathData")] public static StaticResourceKey UpArrowPathData => new("ComboBoxUpArrowPathData"); - - [ResourceKeyDefinition(typeof(CornerRadius), "ComboBoxCornerRadius")] - public static ThemeResourceKey CornerRadius => new("ComboBoxCornerRadius"); } public static partial class Styles { diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/ContentDialog.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/ContentDialog.cs index 0dcd124dc..a9f58bb45 100644 --- a/src/library/Uno.Themes.WinUI.Markup/Theme/ContentDialog.cs +++ b/src/library/Uno.Themes.WinUI.Markup/Theme/ContentDialog.cs @@ -14,35 +14,23 @@ public static partial class ContentDialog { public static partial class Resources { - [ResourceKeyDefinition(typeof(Brush), "MaterialContentDialogBackground")] public static StaticResourceKey Background => new("MaterialContentDialogBackground"); + + [ResourceKeyDefinition(typeof(Thickness), "MaterialContentDialogCommandSpaceToContentMargin")] + public static StaticResourceKey CommandSpaceToContentMargin => new("MaterialContentDialogCommandSpaceToContentMargin"); + [ResourceKeyDefinition(typeof(Brush), "MaterialContentDialogContentForeground")] public static StaticResourceKey ContentForeground => new("MaterialContentDialogContentForeground"); [ResourceKeyDefinition(typeof(CornerRadius), "MaterialContentDialogCornerRadius")] public static StaticResourceKey CornerRadius => new("MaterialContentDialogCornerRadius"); - [ResourceKeyDefinition(typeof(Thickness), "MaterialContentDialogCommandSpaceToContentMargin")] - public static StaticResourceKey CommandSpaceToContentMargin => new("MaterialContentDialogCommandSpaceToContentMargin"); - [ResourceKeyDefinition(typeof(Thickness), "MaterialContentDialogEdgeMargin")] public static StaticResourceKey EdgeMargin => new("MaterialContentDialogEdgeMargin"); - [ResourceKeyDefinition(typeof(Thickness), "MaterialContentDialogPanelPadding")] - public static StaticResourceKey PanelPadding => new("MaterialContentDialogPanelPadding"); - - [ResourceKeyDefinition(typeof(Brush), "MaterialContentDialogSmokeLayerBackground")] - public static StaticResourceKey SmokeLayerBackground => new("MaterialContentDialogSmokeLayerBackground"); - - [ResourceKeyDefinition(typeof(Brush), "MaterialContentDialogTitleForeground")] - public static StaticResourceKey TitleForeground => new("MaterialContentDialogTitleForeground"); - - [ResourceKeyDefinition(typeof(Thickness), "MaterialContentDialogTitleToContentMargin")] - public static StaticResourceKey TitleToContentMargin => new("MaterialContentDialogTitleToContentMargin"); - [ResourceKeyDefinition(typeof(double), "MaterialContentDialogMaxHeight")] public static StaticResourceKey MaxHeight => new("MaterialContentDialogMaxHeight"); @@ -54,6 +42,18 @@ public static partial class Resources [ResourceKeyDefinition(typeof(double), "MaterialContentDialogMinWidth")] public static StaticResourceKey MinWidth => new("MaterialContentDialogMinWidth"); + + [ResourceKeyDefinition(typeof(Thickness), "MaterialContentDialogPanelPadding")] + public static StaticResourceKey PanelPadding => new("MaterialContentDialogPanelPadding"); + + [ResourceKeyDefinition(typeof(Brush), "MaterialContentDialogSmokeLayerBackground")] + public static StaticResourceKey SmokeLayerBackground => new("MaterialContentDialogSmokeLayerBackground"); + + [ResourceKeyDefinition(typeof(Brush), "MaterialContentDialogTitleForeground")] + public static StaticResourceKey TitleForeground => new("MaterialContentDialogTitleForeground"); + + [ResourceKeyDefinition(typeof(Thickness), "MaterialContentDialogTitleToContentMargin")] + public static StaticResourceKey TitleToContentMargin => new("MaterialContentDialogTitleToContentMargin"); } public static partial class Styles { diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs index 0a083b2b1..71a5cc1a0 100644 --- a/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs +++ b/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs @@ -78,25 +78,25 @@ public static partial class ButtonDateTextForeground [ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBackground")] public static ThemeResourceKey ButtonBackground => new("DatePickerButtonBackground"); - [ResourceKeyDefinition(typeof(Brush), "DatePickerButtonForeground")] - public static ThemeResourceKey ButtonForeground => new("DatePickerButtonForeground"); - - [ResourceKeyDefinition(typeof(CornerRadius), "DatePickerCornerRadius")] - public static ThemeResourceKey CornerRadius => new("DatePickerCornerRadius"); - - [ResourceKeyDefinition(typeof(double), "DatePickerHeight")] - public static ThemeResourceKey Height => new("DatePickerHeight"); - - [ResourceKeyDefinition(typeof(double), "DatePickerButtonBottomBorderHeight")] public static ThemeResourceKey ButtonBottomBorderHeight => new("DatePickerButtonBottomBorderHeight"); + [ResourceKeyDefinition(typeof(Brush), "DatePickerButtonForeground")] + public static ThemeResourceKey ButtonForeground => new("DatePickerButtonForeground"); + [ResourceKeyDefinition(typeof(Thickness), "DatePickerButtonHeaderMargin")] public static ThemeResourceKey ButtonHeaderMargin => new("DatePickerButtonHeaderMargin"); [ResourceKeyDefinition(typeof(Thickness), "DatePickerButtonPlaceholderMargin")] public static ThemeResourceKey ButtonPlaceholderMargin => new("DatePickerButtonPlaceholderMargin"); + [ResourceKeyDefinition(typeof(CornerRadius), "DatePickerCornerRadius")] + public static ThemeResourceKey CornerRadius => new("DatePickerCornerRadius"); + + + [ResourceKeyDefinition(typeof(double), "DatePickerHeight")] + public static ThemeResourceKey Height => new("DatePickerHeight"); + [ResourceKeyDefinition(typeof(Brush), "DatePickerPlaceholderTextForeground")] public static ThemeResourceKey PlaceholderTextForeground => new("DatePickerPlaceholderTextForeground"); } diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/FloatingActionButton.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/FloatingActionButton.cs index 243742c87..a09ec4f5a 100644 --- a/src/library/Uno.Themes.WinUI.Markup/Theme/FloatingActionButton.cs +++ b/src/library/Uno.Themes.WinUI.Markup/Theme/FloatingActionButton.cs @@ -64,11 +64,11 @@ public static partial class StateOverlayBackground [ResourceKeyDefinition(typeof(CornerRadius), "MaterialFabCornerRadius")] public static ThemeResourceKey CornerRadius => new("MaterialFabCornerRadius"); - [ResourceKeyDefinition(typeof(Thickness), "MaterialFabPadding")] - public static ThemeResourceKey Padding => new("MaterialFabPadding"); - [ResourceKeyDefinition(typeof(double), "MaterialFabIconTextPadding")] public static ThemeResourceKey IconTextPadding => new("MaterialFabIconTextPadding"); + + [ResourceKeyDefinition(typeof(Thickness), "MaterialFabPadding")] + public static ThemeResourceKey Padding => new("MaterialFabPadding"); } public static partial class LargeFab { @@ -131,11 +131,11 @@ public static partial class StateOverlayBackground [ResourceKeyDefinition(typeof(CornerRadius), "MaterialFabCornerRadius")] public static ThemeResourceKey FabCornerRadius => new("MaterialFabCornerRadius"); - [ResourceKeyDefinition(typeof(Thickness), "MaterialFabPadding")] - public static ThemeResourceKey FabPadding => new("MaterialFabPadding"); - [ResourceKeyDefinition(typeof(double), "MaterialFabIconTextPadding")] public static ThemeResourceKey FabIconTextPadding => new("MaterialFabIconTextPadding"); + + [ResourceKeyDefinition(typeof(Thickness), "MaterialFabPadding")] + public static ThemeResourceKey FabPadding => new("MaterialFabPadding"); } public static partial class SecondaryLargeFab { @@ -220,11 +220,11 @@ public static partial class StateOverlayBackground [ResourceKeyDefinition(typeof(CornerRadius), "MaterialFabCornerRadius")] public static ThemeResourceKey FabCornerRadius => new("MaterialFabCornerRadius"); - [ResourceKeyDefinition(typeof(Thickness), "MaterialFabPadding")] - public static ThemeResourceKey FabPadding => new("MaterialFabPadding"); - [ResourceKeyDefinition(typeof(double), "MaterialFabIconTextPadding")] public static ThemeResourceKey FabIconTextPadding => new("MaterialFabIconTextPadding"); + + [ResourceKeyDefinition(typeof(Thickness), "MaterialFabPadding")] + public static ThemeResourceKey FabPadding => new("MaterialFabPadding"); } public static partial class SurfaceLargeFab { @@ -298,11 +298,11 @@ public static partial class StateOverlayBackground [ResourceKeyDefinition(typeof(CornerRadius), "MaterialFabCornerRadius")] public static ThemeResourceKey FabCornerRadius => new("MaterialFabCornerRadius"); - [ResourceKeyDefinition(typeof(Thickness), "MaterialFabPadding")] - public static ThemeResourceKey FabPadding => new("MaterialFabPadding"); - [ResourceKeyDefinition(typeof(double), "MaterialFabIconTextPadding")] public static ThemeResourceKey FabIconTextPadding => new("MaterialFabIconTextPadding"); + + [ResourceKeyDefinition(typeof(Thickness), "MaterialFabPadding")] + public static ThemeResourceKey FabPadding => new("MaterialFabPadding"); } public static partial class TertiaryLargeFab { diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/MediaPlayerElement.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/MediaPlayerElement.cs index bfe09bacd..d2beb22dd 100644 --- a/src/library/Uno.Themes.WinUI.Markup/Theme/MediaPlayerElement.cs +++ b/src/library/Uno.Themes.WinUI.Markup/Theme/MediaPlayerElement.cs @@ -14,6 +14,15 @@ public static partial class MediaTransportControls { public static partial class Resources { + [ResourceKeyDefinition(typeof(Brush), "MediaTransportControlsBorderBrush")] + public static ThemeResourceKey BorderBrush => new("MediaTransportControlsBorderBrush"); + + [ResourceKeyDefinition(typeof(double), "MediaTransportControlsBorderThickness")] + public static ThemeResourceKey BorderThickness => new("MediaTransportControlsBorderThickness"); + + [ResourceKeyDefinition(typeof(Brush), "MediaTransportControlsFillTimeElapsedText")] + public static ThemeResourceKey FillTimeElapsedText => new("MediaTransportControlsFillTimeElapsedText"); + [ResourceKeyDefinition(typeof(Thickness), "MediaTransportControlsMargin")] public static ThemeResourceKey Margin => new("MediaTransportControlsMargin"); @@ -23,9 +32,6 @@ public static partial class Resources [ResourceKeyDefinition(typeof(double), "MediaTransportControlsMinWidth")] public static ThemeResourceKey MinWidth => new("MediaTransportControlsMinWidth"); - [ResourceKeyDefinition(typeof(Brush), "MediaTransportControlsFillTimeElapsedText")] - public static ThemeResourceKey FillTimeElapsedText => new("MediaTransportControlsFillTimeElapsedText"); - [ResourceKeyDefinition(typeof(Brush), "MediaTransportControlsPanelBackground")] public static ThemeResourceKey PanelBackground => new("MediaTransportControlsPanelBackground"); @@ -34,12 +40,6 @@ public static partial class Resources [ResourceKeyDefinition(typeof(double), "MediaTransportControlsSliderHeight")] public static ThemeResourceKey SliderHeight => new("MediaTransportControlsSliderHeight"); - - [ResourceKeyDefinition(typeof(Brush), "MediaTransportControlsBorderBrush")] - public static ThemeResourceKey BorderBrush => new("MediaTransportControlsBorderBrush"); - - [ResourceKeyDefinition(typeof(double), "MediaTransportControlsBorderThickness")] - public static ThemeResourceKey BorderThickness => new("MediaTransportControlsBorderThickness"); } public static partial class Styles { diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/PasswordBox.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/PasswordBox.cs index 8c07368f0..325b37280 100644 --- a/src/library/Uno.Themes.WinUI.Markup/Theme/PasswordBox.cs +++ b/src/library/Uno.Themes.WinUI.Markup/Theme/PasswordBox.cs @@ -100,15 +100,15 @@ public static partial class PlaceholderForeground [ResourceKeyDefinition(typeof(string), "FilledPasswordBoxFontWeight")] public static ThemeResourceKey FontWeight => new("FilledPasswordBoxFontWeight"); + [ResourceKeyDefinition(typeof(double), "FilledPasswordBoxForegroundOpacityDisabled")] + public static ThemeResourceKey ForegroundOpacityDisabled => new("FilledPasswordBoxForegroundOpacityDisabled"); + [ResourceKeyDefinition(typeof(double), "FilledPasswordBoxMinHeight")] public static ThemeResourceKey MinHeight => new("FilledPasswordBoxMinHeight"); [ResourceKeyDefinition(typeof(Thickness), "FilledPasswordBoxPadding")] public static ThemeResourceKey Padding => new("FilledPasswordBoxPadding"); - [ResourceKeyDefinition(typeof(double), "FilledPasswordBoxForegroundOpacityDisabled")] - public static ThemeResourceKey ForegroundOpacityDisabled => new("FilledPasswordBoxForegroundOpacityDisabled"); - [ResourceKeyDefinition(typeof(Brush), "FilledPasswordBoxRevealButtonForeground")] public static ThemeResourceKey RevealButtonForeground => new("FilledPasswordBoxRevealButtonForeground"); } @@ -215,14 +215,14 @@ public static partial class PlaceholderForeground [ResourceKeyDefinition(typeof(string), "OutlinedPasswordBoxFontWeight")] public static ThemeResourceKey FontWeight => new("OutlinedPasswordBoxFontWeight"); + [ResourceKeyDefinition(typeof(double), "OutlinedPasswordBoxForegroundOpacityDisabled")] + public static ThemeResourceKey ForegroundOpacityDisabled => new("OutlinedPasswordBoxForegroundOpacityDisabled"); + [ResourceKeyDefinition(typeof(double), "OutlinedPasswordBoxMinHeight")] public static ThemeResourceKey MinHeight => new("OutlinedPasswordBoxMinHeight"); [ResourceKeyDefinition(typeof(Thickness), "OutlinedPasswordBoxPadding")] public static ThemeResourceKey Padding => new("OutlinedPasswordBoxPadding"); - - [ResourceKeyDefinition(typeof(double), "OutlinedPasswordBoxForegroundOpacityDisabled")] - public static ThemeResourceKey ForegroundOpacityDisabled => new("OutlinedPasswordBoxForegroundOpacityDisabled"); } } public static partial class Styles diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/RadioButton.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/RadioButton.cs index 791bb7db9..8073fc04e 100644 --- a/src/library/Uno.Themes.WinUI.Markup/Theme/RadioButton.cs +++ b/src/library/Uno.Themes.WinUI.Markup/Theme/RadioButton.cs @@ -89,6 +89,12 @@ public static partial class Opacity [ResourceKeyDefinition(typeof(int), "RadioButtonCharacterSpacing")] public static ThemeResourceKey CharacterSpacing => new("RadioButtonCharacterSpacing"); + [ResourceKeyDefinition(typeof(Thickness), "RadioButtonCheckEllipsePadding")] + public static ThemeResourceKey CheckEllipsePadding => new("RadioButtonCheckEllipsePadding"); + + [ResourceKeyDefinition(typeof(double), "RadioButtonCheckGlyphSize")] + public static ThemeResourceKey CheckGlyphSize => new("RadioButtonCheckGlyphSize"); + [ResourceKeyDefinition(typeof(FontFamily), "RadioButtonFontFamily")] public static ThemeResourceKey FontFamily => new("RadioButtonFontFamily"); @@ -98,6 +104,9 @@ public static partial class Opacity [ResourceKeyDefinition(typeof(string), "RadioButtonFontWeight")] public static ThemeResourceKey FontWeight => new("RadioButtonFontWeight"); + [ResourceKeyDefinition(typeof(double), "RadioButtonHeight")] + public static ThemeResourceKey Height => new("RadioButtonHeight"); + [ResourceKeyDefinition(typeof(double), "RadioButtonMinHeight")] public static ThemeResourceKey MinHeight => new("RadioButtonMinHeight"); @@ -110,26 +119,17 @@ public static partial class Opacity [ResourceKeyDefinition(typeof(Thickness), "RadioButtonPadding")] public static ThemeResourceKey Padding => new("RadioButtonPadding"); - [ResourceKeyDefinition(typeof(Thickness), "RadioButtonCheckEllipsePadding")] - public static ThemeResourceKey CheckEllipsePadding => new("RadioButtonCheckEllipsePadding"); - - [ResourceKeyDefinition(typeof(double), "RadioButtonCheckGlyphSize")] - public static ThemeResourceKey CheckGlyphSize => new("RadioButtonCheckGlyphSize"); - [ResourceKeyDefinition(typeof(Brush), "RadioButtonStateCircleBackgroundChecked")] public static ThemeResourceKey StateCircleBackgroundChecked => new("RadioButtonStateCircleBackgroundChecked"); [ResourceKeyDefinition(typeof(Brush), "RadioButtonStateCircleBackgroundUnchecked")] public static ThemeResourceKey StateCircleBackgroundUnchecked => new("RadioButtonStateCircleBackgroundUnchecked"); - [ResourceKeyDefinition(typeof(double), "RadioButtonHeight")] - public static ThemeResourceKey Height => new("RadioButtonHeight"); + [ResourceKeyDefinition(typeof(double), "RadioButtonStrokeThickness")] + public static ThemeResourceKey StrokeThickness => new("RadioButtonStrokeThickness"); [ResourceKeyDefinition(typeof(double), "RadioButtonWidth")] public static ThemeResourceKey Width => new("RadioButtonWidth"); - - [ResourceKeyDefinition(typeof(double), "RadioButtonStrokeThickness")] - public static ThemeResourceKey StrokeThickness => new("RadioButtonStrokeThickness"); } public static partial class Styles { diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/Slider.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/Slider.cs index e7f56684c..bdfa8a64d 100644 --- a/src/library/Uno.Themes.WinUI.Markup/Theme/Slider.cs +++ b/src/library/Uno.Themes.WinUI.Markup/Theme/Slider.cs @@ -14,30 +14,6 @@ public static partial class Slider { public static partial class Resources { - public static partial class BottomTickBar - { - [ResourceKeyDefinition(typeof(double), "SliderBottomTickBarHeight")] - public static ThemeResourceKey Height => new("SliderBottomTickBarHeight"); - - [ResourceKeyDefinition(typeof(Thickness), "SliderBottomTickBarMargin")] - public static ThemeResourceKey Margin => new("SliderBottomTickBarMargin"); - } - public static partial class LeftTickBar - { - [ResourceKeyDefinition(typeof(Thickness), "SliderLeftTickBarMargin")] - public static ThemeResourceKey Margin => new("SliderLeftTickBarMargin"); - - [ResourceKeyDefinition(typeof(double), "SliderLeftTickBarWidth")] - public static ThemeResourceKey Width => new("SliderLeftTickBarWidth"); - } - public static partial class RightTickBar - { - [ResourceKeyDefinition(typeof(Thickness), "SliderRightTickBarMargin")] - public static ThemeResourceKey Margin => new("SliderRightTickBarMargin"); - - [ResourceKeyDefinition(typeof(double), "SliderRightTickBarWidth")] - public static ThemeResourceKey Width => new("SliderRightTickBarWidth"); - } public static partial class Thumb { [ResourceKeyDefinition(typeof(Brush), "SliderThumbBackgroundDisabled")] @@ -49,30 +25,84 @@ public static partial class Thumb [ResourceKeyDefinition(typeof(double), "SliderThumbWidth")] public static ThemeResourceKey Width => new("SliderThumbWidth"); } - public static partial class TickBarFill - { - [ResourceKeyDefinition(typeof(Brush), "SliderTickBarFill")] - public static ThemeResourceKey Default => new("SliderTickBarFill"); - - [ResourceKeyDefinition(typeof(Brush), "SliderTickBarFillDisabled")] - public static ThemeResourceKey Disabled => new("SliderTickBarFillDisabled"); - } - public static partial class TopTickBar + public static partial class TickBar { - [ResourceKeyDefinition(typeof(double), "SliderTopTickBarHeight")] - public static ThemeResourceKey Height => new("SliderTopTickBarHeight"); - - [ResourceKeyDefinition(typeof(Thickness), "SliderTopTickBarMargin")] - public static ThemeResourceKey Margin => new("SliderTopTickBarMargin"); + public static partial class Bottom + { + [ResourceKeyDefinition(typeof(double), "SliderBottomTickBarHeight")] + public static ThemeResourceKey Height => new("SliderBottomTickBarHeight"); + + [ResourceKeyDefinition(typeof(Thickness), "SliderBottomTickBarMargin")] + public static ThemeResourceKey Margin => new("SliderBottomTickBarMargin"); + } + public static partial class Fill + { + [ResourceKeyDefinition(typeof(Brush), "SliderTickBarFill")] + public static ThemeResourceKey Default => new("SliderTickBarFill"); + + [ResourceKeyDefinition(typeof(Brush), "SliderTickBarFillDisabled")] + public static ThemeResourceKey Disabled => new("SliderTickBarFillDisabled"); + } + public static partial class Left + { + [ResourceKeyDefinition(typeof(Thickness), "SliderLeftTickBarMargin")] + public static ThemeResourceKey Margin => new("SliderLeftTickBarMargin"); + + [ResourceKeyDefinition(typeof(double), "SliderLeftTickBarWidth")] + public static ThemeResourceKey Width => new("SliderLeftTickBarWidth"); + } + public static partial class Right + { + [ResourceKeyDefinition(typeof(Thickness), "SliderRightTickBarMargin")] + public static ThemeResourceKey Margin => new("SliderRightTickBarMargin"); + + [ResourceKeyDefinition(typeof(double), "SliderRightTickBarWidth")] + public static ThemeResourceKey Width => new("SliderRightTickBarWidth"); + } + public static partial class Top + { + [ResourceKeyDefinition(typeof(double), "SliderTopTickBarHeight")] + public static ThemeResourceKey Height => new("SliderTopTickBarHeight"); + + [ResourceKeyDefinition(typeof(Thickness), "SliderTopTickBarMargin")] + public static ThemeResourceKey Margin => new("SliderTopTickBarMargin"); + } + [ResourceKeyDefinition(typeof(double), "SliderHorizontalInlineTickBarHeight")] + public static ThemeResourceKey HorizontalInlineHeight => new("SliderHorizontalInlineTickBarHeight"); + + [ResourceKeyDefinition(typeof(Brush), "SliderInlineTickBarFill")] + public static ThemeResourceKey InlineFill => new("SliderInlineTickBarFill"); + + [ResourceKeyDefinition(typeof(double), "SliderVerticallInlineTickBarWidth")] + public static ThemeResourceKey VerticallInlineWidth => new("SliderVerticallInlineTickBarWidth"); } public static partial class Track { - [ResourceKeyDefinition(typeof(Brush), "SliderTrackFillDisabled")] - public static ThemeResourceKey FillDisabled => new("SliderTrackFillDisabled"); + public static partial class Fill + { + [ResourceKeyDefinition(typeof(Brush), "SliderTrackFill")] + public static ThemeResourceKey Default => new("SliderTrackFill"); + + [ResourceKeyDefinition(typeof(Brush), "SliderTrackFillDisabled")] + public static ThemeResourceKey Disabled => new("SliderTrackFillDisabled"); + } + public static partial class ValueFill + { + [ResourceKeyDefinition(typeof(Brush), "SliderTrackValueFill")] + public static ThemeResourceKey Default => new("SliderTrackValueFill"); + + [ResourceKeyDefinition(typeof(Brush), "SliderTrackValueFillDisabled")] + public static ThemeResourceKey Disabled => new("SliderTrackValueFillDisabled"); + } + [ResourceKeyDefinition(typeof(CornerRadius), "SliderTrackCornerRadius")] + public static ThemeResourceKey CornerRadius => new("SliderTrackCornerRadius"); [ResourceKeyDefinition(typeof(double), "SliderTrackThickness")] public static ThemeResourceKey Thickness => new("SliderTrackThickness"); } + [ResourceKeyDefinition(typeof(double), "SliderFillThickness")] + public static ThemeResourceKey FillThickness => new("SliderFillThickness"); + [ResourceKeyDefinition(typeof(Thickness), "SliderFocusVisualMargin")] public static ThemeResourceKey FocusVisualMargin => new("SliderFocusVisualMargin"); @@ -82,41 +112,17 @@ public static partial class Track [ResourceKeyDefinition(typeof(double), "SliderFontSize")] public static ThemeResourceKey FontSize => new("SliderFontSize"); - [ResourceKeyDefinition(typeof(CornerRadius), "SliderTrackCornerRadius")] - public static ThemeResourceKey TrackCornerRadius => new("SliderTrackCornerRadius"); - - [ResourceKeyDefinition(typeof(Brush), "SliderTrackFill")] - public static ThemeResourceKey TrackFill => new("SliderTrackFill"); - - [ResourceKeyDefinition(typeof(Brush), "SliderTrackValueFill")] - public static ThemeResourceKey TrackValueFill => new("SliderTrackValueFill"); - - [ResourceKeyDefinition(typeof(double), "SliderFillThickness")] - public static ThemeResourceKey FillThickness => new("SliderFillThickness"); - - [ResourceKeyDefinition(typeof(Brush), "SliderInlineTickBarFill")] - public static ThemeResourceKey InlineTickBarFill => new("SliderInlineTickBarFill"); - - [ResourceKeyDefinition(typeof(Brush), "SliderTrackValueFillDisabled")] - public static ThemeResourceKey TrackValueFillDisabled => new("SliderTrackValueFillDisabled"); - [ResourceKeyDefinition(typeof(CornerRadius), "SliderHorizontalFillCornerRadius")] public static ThemeResourceKey HorizontalFillCornerRadius => new("SliderHorizontalFillCornerRadius"); [ResourceKeyDefinition(typeof(Thickness), "SliderHorizontalFocusVisualMargin")] public static ThemeResourceKey HorizontalFocusVisualMargin => new("SliderHorizontalFocusVisualMargin"); - [ResourceKeyDefinition(typeof(double), "SliderHorizontalInlineTickBarHeight")] - public static ThemeResourceKey HorizontalInlineTickBarHeight => new("SliderHorizontalInlineTickBarHeight"); - [ResourceKeyDefinition(typeof(CornerRadius), "SliderVerticalFillCornerRadius")] public static ThemeResourceKey VerticalFillCornerRadius => new("SliderVerticalFillCornerRadius"); [ResourceKeyDefinition(typeof(Thickness), "SliderVerticalFocusVisualMargin")] public static ThemeResourceKey VerticalFocusVisualMargin => new("SliderVerticalFocusVisualMargin"); - - [ResourceKeyDefinition(typeof(double), "SliderVerticallInlineTickBarWidth")] - public static ThemeResourceKey VerticallInlineTickBarWidth => new("SliderVerticallInlineTickBarWidth"); } public static partial class Styles { diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/TextBox.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/TextBox.cs index d7a61d4bb..daf4322ca 100644 --- a/src/library/Uno.Themes.WinUI.Markup/Theme/TextBox.cs +++ b/src/library/Uno.Themes.WinUI.Markup/Theme/TextBox.cs @@ -99,12 +99,15 @@ public static partial class PlaceholderForeground [ResourceKeyDefinition(typeof(Brush), "FilledTextBoxPlaceholderForegroundPointerOver")] public static ThemeResourceKey PointerOver => new("FilledTextBoxPlaceholderForegroundPointerOver"); } - [ResourceKeyDefinition(typeof(Thickness), "MaterialFilledTextBoxPadding")] - public static ThemeResourceKey Padding => new("MaterialFilledTextBoxPadding"); + [ResourceKeyDefinition(typeof(double), "FilledTextBoxBorderThicknessFocused")] + public static ThemeResourceKey BorderThicknessFocused => new("FilledTextBoxBorderThicknessFocused"); [ResourceKeyDefinition(typeof(int), "FilledTextBoxCharacterSpacing")] public static ThemeResourceKey CharacterSpacing => new("FilledTextBoxCharacterSpacing"); + [ResourceKeyDefinition(typeof(CornerRadius), "MaterialFilledTextBoxCornerRadius")] + public static ThemeResourceKey CornerRadius => new("MaterialFilledTextBoxCornerRadius"); + [ResourceKeyDefinition(typeof(FontFamily), "FilledTextBoxFontFamily")] public static ThemeResourceKey FontFamily => new("FilledTextBoxFontFamily"); @@ -114,17 +117,14 @@ public static partial class PlaceholderForeground [ResourceKeyDefinition(typeof(string), "FilledTextBoxFontWeight")] public static ThemeResourceKey FontWeight => new("FilledTextBoxFontWeight"); - [ResourceKeyDefinition(typeof(CornerRadius), "MaterialFilledTextBoxCornerRadius")] - public static ThemeResourceKey CornerRadius => new("MaterialFilledTextBoxCornerRadius"); + [ResourceKeyDefinition(typeof(double), "FilledTextBoxForegroundOpacityDisabled")] + public static ThemeResourceKey ForegroundOpacityDisabled => new("FilledTextBoxForegroundOpacityDisabled"); [ResourceKeyDefinition(typeof(double), "MaterialFilledTextBoxMinHeight")] public static ThemeResourceKey MinHeight => new("MaterialFilledTextBoxMinHeight"); - [ResourceKeyDefinition(typeof(double), "FilledTextBoxBorderThicknessFocused")] - public static ThemeResourceKey BorderThicknessFocused => new("FilledTextBoxBorderThicknessFocused"); - - [ResourceKeyDefinition(typeof(double), "FilledTextBoxForegroundOpacityDisabled")] - public static ThemeResourceKey ForegroundOpacityDisabled => new("FilledTextBoxForegroundOpacityDisabled"); + [ResourceKeyDefinition(typeof(Thickness), "MaterialFilledTextBoxPadding")] + public static ThemeResourceKey Padding => new("MaterialFilledTextBoxPadding"); } public static partial class Outlined { @@ -178,21 +178,21 @@ public static partial class PlaceholderForeground [ResourceKeyDefinition(typeof(Brush), "OutlinedTextBoxPlaceholderForegroundPointerOver")] public static ThemeResourceKey PointerOver => new("OutlinedTextBoxPlaceholderForegroundPointerOver"); } - [ResourceKeyDefinition(typeof(Thickness), "MaterialOutlinedTextBoxPadding")] - public static ThemeResourceKey Padding => new("MaterialOutlinedTextBoxPadding"); + [ResourceKeyDefinition(typeof(Thickness), "MaterialOutlinedTextBoxBorderPadding")] + public static ThemeResourceKey BorderPadding => new("MaterialOutlinedTextBoxBorderPadding"); [ResourceKeyDefinition(typeof(double), "MaterialOutlinedTextBoxBorderThickness")] public static ThemeResourceKey BorderThickness => new("MaterialOutlinedTextBoxBorderThickness"); - [ResourceKeyDefinition(typeof(CornerRadius), "MaterialOutlinedTextBoxCornerRadius")] - public static ThemeResourceKey CornerRadius => new("MaterialOutlinedTextBoxCornerRadius"); - - [ResourceKeyDefinition(typeof(double), "MaterialOutlinedTextBoxMinHeight")] - public static ThemeResourceKey MinHeight => new("MaterialOutlinedTextBoxMinHeight"); + [ResourceKeyDefinition(typeof(double), "MaterialOutlinedTextBoxBorderThicknessFocused")] + public static ThemeResourceKey BorderThicknessFocused => new("MaterialOutlinedTextBoxBorderThicknessFocused"); [ResourceKeyDefinition(typeof(int), "OutlinedTextBoxCharacterSpacing")] public static ThemeResourceKey CharacterSpacing => new("OutlinedTextBoxCharacterSpacing"); + [ResourceKeyDefinition(typeof(CornerRadius), "MaterialOutlinedTextBoxCornerRadius")] + public static ThemeResourceKey CornerRadius => new("MaterialOutlinedTextBoxCornerRadius"); + [ResourceKeyDefinition(typeof(FontFamily), "OutlinedTextBoxFontFamily")] public static ThemeResourceKey FontFamily => new("OutlinedTextBoxFontFamily"); @@ -202,14 +202,14 @@ public static partial class PlaceholderForeground [ResourceKeyDefinition(typeof(string), "OutlinedTextBoxFontWeight")] public static ThemeResourceKey FontWeight => new("OutlinedTextBoxFontWeight"); - [ResourceKeyDefinition(typeof(Thickness), "MaterialOutlinedTextBoxBorderPadding")] - public static ThemeResourceKey BorderPadding => new("MaterialOutlinedTextBoxBorderPadding"); - - [ResourceKeyDefinition(typeof(double), "MaterialOutlinedTextBoxBorderThicknessFocused")] - public static ThemeResourceKey BorderThicknessFocused => new("MaterialOutlinedTextBoxBorderThicknessFocused"); - [ResourceKeyDefinition(typeof(double), "OutlinedTextBoxForegroundOpacityDisabled")] public static ThemeResourceKey ForegroundOpacityDisabled => new("OutlinedTextBoxForegroundOpacityDisabled"); + + [ResourceKeyDefinition(typeof(double), "MaterialOutlinedTextBoxMinHeight")] + public static ThemeResourceKey MinHeight => new("MaterialOutlinedTextBoxMinHeight"); + + [ResourceKeyDefinition(typeof(Thickness), "MaterialOutlinedTextBoxPadding")] + public static ThemeResourceKey Padding => new("MaterialOutlinedTextBoxPadding"); } } public static partial class Styles diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleButton.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleButton.cs index 19d835a3b..30d0476f1 100644 --- a/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleButton.cs +++ b/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleButton.cs @@ -244,12 +244,24 @@ public static partial class Foreground [ResourceKeyDefinition(typeof(Color), "TextToggleButtonForegroundPressed")] public static ThemeResourceKey Pressed => new("TextToggleButtonForegroundPressed"); } + [ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushFocusedOverlay")] + public static ThemeResourceKey BorderBrushFocusedOverlay => new("TextToggleButtonBorderBrushFocusedOverlay"); + + [ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushHoverOverlay")] + public static ThemeResourceKey BorderBrushHoverOverlay => new("TextToggleButtonBorderBrushHoverOverlay"); + + [ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushSelectedOverlay")] + public static ThemeResourceKey BorderBrushSelectedOverlay => new("TextToggleButtonBorderBrushSelectedOverlay"); + [ResourceKeyDefinition(typeof(Thickness), "TextToggleButtonBorderThickness")] public static ThemeResourceKey BorderThickness => new("TextToggleButtonBorderThickness"); [ResourceKeyDefinition(typeof(CornerRadius), "TextToggleButtonCornerRadius")] public static ThemeResourceKey CornerRadius => new("TextToggleButtonCornerRadius"); + [ResourceKeyDefinition(typeof(Brush), "TextToggleButtonFeedbackFocused")] + public static ThemeResourceKey FeedbackFocused => new("TextToggleButtonFeedbackFocused"); + [ResourceKeyDefinition(typeof(FontFamily), "TextToggleButtonFontFamily")] public static ThemeResourceKey FontFamily => new("TextToggleButtonFontFamily"); @@ -261,18 +273,6 @@ public static partial class Foreground [ResourceKeyDefinition(typeof(Thickness), "TextToggleButtonPadding")] public static ThemeResourceKey Padding => new("TextToggleButtonPadding"); - - [ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushFocusedOverlay")] - public static ThemeResourceKey BorderBrushFocusedOverlay => new("TextToggleButtonBorderBrushFocusedOverlay"); - - [ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushHoverOverlay")] - public static ThemeResourceKey BorderBrushHoverOverlay => new("TextToggleButtonBorderBrushHoverOverlay"); - - [ResourceKeyDefinition(typeof(Brush), "TextToggleButtonBorderBrushSelectedOverlay")] - public static ThemeResourceKey BorderBrushSelectedOverlay => new("TextToggleButtonBorderBrushSelectedOverlay"); - - [ResourceKeyDefinition(typeof(Brush), "TextToggleButtonFeedbackFocused")] - public static ThemeResourceKey FeedbackFocused => new("TextToggleButtonFeedbackFocused"); } } public static partial class Styles diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleSwitch.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleSwitch.cs index 493c324a4..6f35ddac7 100644 --- a/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleSwitch.cs +++ b/src/library/Uno.Themes.WinUI.Markup/Theme/ToggleSwitch.cs @@ -16,11 +16,11 @@ public static partial class Resources { public static partial class KnobIcon { - [ResourceKeyDefinition(typeof(double), "KnobIconSize")] - public static ThemeResourceKey Size => new("KnobIconSize"); - [ResourceKeyDefinition(typeof(Thickness), "KnobIconPadding")] public static ThemeResourceKey Padding => new("KnobIconPadding"); + + [ResourceKeyDefinition(typeof(double), "KnobIconSize")] + public static ThemeResourceKey Size => new("KnobIconSize"); } public static partial class KnobOffFill { @@ -154,21 +154,18 @@ public static partial class OnSwitchKnobBoundsFill } public static partial class SwitchKnob { - [ResourceKeyDefinition(typeof(double), "SwitchKnobRadius")] - public static ThemeResourceKey Radius => new("SwitchKnobRadius"); - [ResourceKeyDefinition(typeof(double), "SwitchKnobHeight")] public static ThemeResourceKey Height => new("SwitchKnobHeight"); - [ResourceKeyDefinition(typeof(double), "SwitchKnobWidth")] - public static ThemeResourceKey Width => new("SwitchKnobWidth"); + [ResourceKeyDefinition(typeof(double), "SwitchKnobRadius")] + public static ThemeResourceKey Radius => new("SwitchKnobRadius"); [ResourceKeyDefinition(typeof(double), "SwitchKnobStrokeThickness")] public static ThemeResourceKey StrokeThickness => new("SwitchKnobStrokeThickness"); - } - [ResourceKeyDefinition(typeof(double), "SwitchKnobShadowSize")] - public static ThemeResourceKey SwitchKnobShadowSize => new("SwitchKnobShadowSize"); + [ResourceKeyDefinition(typeof(double), "SwitchKnobWidth")] + public static ThemeResourceKey Width => new("SwitchKnobWidth"); + } [ResourceKeyDefinition(typeof(CornerRadius), "LargeThumbCornerRadius")] public static ThemeResourceKey LargeThumbCornerRadius => new("LargeThumbCornerRadius"); @@ -187,6 +184,9 @@ public static partial class SwitchKnob [ResourceKeyDefinition(typeof(Thickness), "SwitchKnobOnShadowMargin")] public static ThemeResourceKey SwitchKnobOnShadowMargin => new("SwitchKnobOnShadowMargin"); + [ResourceKeyDefinition(typeof(double), "SwitchKnobShadowSize")] + public static ThemeResourceKey SwitchKnobShadowSize => new("SwitchKnobShadowSize"); + [ResourceKeyDefinition(typeof(Brush), "ToggleSwitchThumb")] public static ThemeResourceKey Thumb => new("ToggleSwitchThumb"); }