From b0bb2b4c59e52322ab270c1428c247f3bc988eea Mon Sep 17 00:00:00 2001 From: Ariel De Los Santos Date: Thu, 28 Sep 2023 14:14:33 -0400 Subject: [PATCH] refactor: refactoring lightweight styling resources on ComboBox (#1209) Co-authored-by: Steve Bilogan --- .../Uno.Themes.WinUI.Markup/Theme/ComboBox.cs | 387 ++++++++++-------- 1 file changed, 219 insertions(+), 168 deletions(-) diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/ComboBox.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/ComboBox.cs index 4a4c39dd6..04ddd31b9 100644 --- a/src/library/Uno.Themes.WinUI.Markup/Theme/ComboBox.cs +++ b/src/library/Uno.Themes.WinUI.Markup/Theme/ComboBox.cs @@ -34,6 +34,79 @@ public static class Foreground public static ThemeResourceKey FocusedPressed => new("ComboBoxForegroundFocusedPressed"); } + public static class PlaceholderForeground + { + [ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForeground")] + public static ThemeResourceKey Default => new("ComboBoxPlaceHolderForeground"); + + [ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundPointerOver")] + public static ThemeResourceKey PointerOver => new("ComboBoxPlaceHolderForegroundPointerOver"); + + [ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundPressed")] + public static ThemeResourceKey Pressed => new("ComboBoxPlaceHolderForegroundPressed"); + + [ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundDisabled")] + public static ThemeResourceKey Disabled => new("ComboBoxPlaceHolderForegroundDisabled"); + + [ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundFocused")] + public static ThemeResourceKey Focused => new("ComboBoxPlaceHolderForegroundFocused"); + + [ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundFocusedPressed")] + public static ThemeResourceKey FocusedPressed => new("ComboBoxPlaceHolderForegroundFocusedPressed"); + + } + + public static class UpperPlaceholderForeground + { + [ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForeground")] + public static ThemeResourceKey Default => new("ComboBoxUpperPlaceHolderForeground"); + + [ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundPointerOver")] + public static ThemeResourceKey PointerOver => new("ComboBoxUpperPlaceHolderForegroundPointerOver"); + + [ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundPressed")] + public static ThemeResourceKey Pressed => new("ComboBoxUpperPlaceHolderForegroundPressed"); + + [ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundDisabled")] + public static ThemeResourceKey Disabled => new("ComboBoxUpperPlaceHolderForegroundDisabled"); + + [ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundFocused")] + public static ThemeResourceKey Focused => new("ComboBoxUpperPlaceHolderForegroundFocused"); + + [ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundFocusedPressed")] + public static ThemeResourceKey FocusedPressed => new("ComboBoxUpperPlaceHolderForegroundFocusedPressed"); + + [ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundOpened")] + public static ThemeResourceKey Opened => new("ComboBoxUpperPlaceHolderForegroundOpened"); + } + + public static class LeadingIcon + { + public static class Foreground + { + [ResourceKeyDefinition(typeof(Brush), "ComboBoxLeadingIconForeground")] + public static ThemeResourceKey Default => new("ComboBoxLeadingIconForeground"); + + [ResourceKeyDefinition(typeof(Brush), "ComboBoxLeadingIconForegroundDisabled")] + public static ThemeResourceKey Disabled => new("ComboBoxLeadingIconForegroundDisabled"); + } + + [ResourceKeyDefinition(typeof(double), "ComboBoxLeadingIconWidth")] + public static ThemeResourceKey Width => new("ComboBoxLeadingIconWidth"); + + [ResourceKeyDefinition(typeof(Thickness), "ComboBoxLeadingIconMargin")] + public static ThemeResourceKey Margin => new("ComboBoxLeadingIconMargin"); + } + + public static class ArrowForeground + { + [ResourceKeyDefinition(typeof(Brush), "ComboBoxArrowForeground")] + public static ThemeResourceKey Default => new("ComboBoxArrowForeground"); + + [ResourceKeyDefinition(typeof(Brush), "ComboBoxArrowForegroundOpened")] + public static ThemeResourceKey Opened => new("ComboBoxArrowForegroundOpened"); + } + public static class Background { [ResourceKeyDefinition(typeof(Brush), "ComboBoxBackground")] @@ -76,218 +149,196 @@ public static class BorderBrush public static ThemeResourceKey Opened => new("ComboBoxBorderBrushOpened"); } - public static class PlaceHolderForeground + public static class Item { - [ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForeground")] - public static ThemeResourceKey Default => new("ComboBoxPlaceHolderForeground"); + public static class Foreground + { + [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemForeground")] + public static ThemeResourceKey Default => new("ComboBoxItemForeground"); - [ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundPointerOver")] - public static ThemeResourceKey PointerOver => new("ComboBoxPlaceHolderForegroundPointerOver"); + [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemForegroundPressed")] + public static ThemeResourceKey Pressed => new("ComboBoxItemForegroundPressed"); - [ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundPressed")] - public static ThemeResourceKey Pressed => new("ComboBoxPlaceHolderForegroundPressed"); + [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemForegroundPointerOver")] + public static ThemeResourceKey PointerOver => new("ComboBoxItemForegroundPointerOver"); - [ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundDisabled")] - public static ThemeResourceKey Disabled => new("ComboBoxPlaceHolderForegroundDisabled"); + [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemForegroundDisabled")] + public static ThemeResourceKey Disabled => new("ComboBoxItemForegroundDisabled"); - [ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundFocused")] - public static ThemeResourceKey Focused => new("ComboBoxPlaceHolderForegroundFocused"); + [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemForegroundSelected")] + public static ThemeResourceKey Selected => new("ComboBoxItemForegroundSelected"); - [ResourceKeyDefinition(typeof(Brush), "ComboBoxPlaceHolderForegroundFocusedPressed")] - public static ThemeResourceKey FocusedPressed => new("ComboBoxPlaceHolderForegroundFocusedPressed"); - } - - public static class LeadingIconForeground - { - [ResourceKeyDefinition(typeof(Brush), "ComboBoxLeadingIconForeground")] - public static ThemeResourceKey Default => new("ComboBoxLeadingIconForeground"); - - [ResourceKeyDefinition(typeof(Brush), "ComboBoxLeadingIconForegroundDisabled")] - public static ThemeResourceKey Disabled => new("ComboBoxLeadingIconForegroundDisabled"); - } - - public static class ArrowForeground - { - [ResourceKeyDefinition(typeof(Brush), "ComboBoxArrowForeground")] - public static ThemeResourceKey Default => new("ComboBoxArrowForeground"); - - [ResourceKeyDefinition(typeof(Brush), "ComboBoxArrowForegroundOpened")] - public static ThemeResourceKey Opened => new("ComboBoxArrowForegroundOpened"); - } - - public static class UpperPlaceHolderForeground - { - [ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForeground")] - public static ThemeResourceKey Default => new("ComboBoxUpperPlaceHolderForeground"); - } - } - - public static class ComboBoxItem - { - public static class Foreground - { - [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemForeground")] - public static ThemeResourceKey Default => new("ComboBoxItemForeground"); - - [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemForegroundPressed")] - public static ThemeResourceKey Pressed => new("ComboBoxItemForegroundPressed"); - - [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemForegroundPointerOver")] - public static ThemeResourceKey PointerOver => new("ComboBoxItemForegroundPointerOver"); - - [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemForegroundDisabled")] - public static ThemeResourceKey Disabled => new("ComboBoxItemForegroundDisabled"); - } - - public static class ForegroundSelected - { - [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemForegroundSelected")] - public static ThemeResourceKey Default => new("ComboBoxItemForegroundSelected"); + [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemForegroundSelectedUnfocused")] + public static ThemeResourceKey SelectedUnfocused => new("ComboBoxItemForegroundSelectedUnfocused"); - [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemForegroundSelectedUnfocused")] - public static ThemeResourceKey Unfocused => new("ComboBoxItemForegroundSelectedUnfocused"); + [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemForegroundSelectedPressed")] + public static ThemeResourceKey SelectedPressed => new("ComboBoxItemForegroundSelectedPressed"); - [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemForegroundSelectedPressed")] - public static ThemeResourceKey Pressed => new("ComboBoxItemForegroundSelectedPressed"); + [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemForegroundSelectedPointerOver")] + public static ThemeResourceKey SelectedPointerOver => new("ComboBoxItemForegroundSelectedPointerOver"); - [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemForegroundSelectedPointerOver")] - public static ThemeResourceKey PointerOver => new("ComboBoxItemForegroundSelectedPointerOver"); + [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemForegroundSelectedDisabled")] + public static ThemeResourceKey SelectedDisabled => new("ComboBoxItemForegroundSelectedDisabled"); + } - [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemForegroundSelectedDisabled")] - public static ThemeResourceKey Disabled => new("ComboBoxItemForegroundSelectedDisabled"); - } + public static class Background + { + [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBackground")] + public static ThemeResourceKey Default => new("ComboBoxItemBackground"); - public static class Background - { - [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBackground")] - public static ThemeResourceKey Default => new("ComboBoxItemBackground"); + [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBackgroundPressed")] + public static ThemeResourceKey Pressed => new("ComboBoxItemBackgroundPressed"); - [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBackgroundPressed")] - public static ThemeResourceKey Pressed => new("ComboBoxItemBackgroundPressed"); + [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBackgroundPointerOver")] + public static ThemeResourceKey PointerOver => new("ComboBoxItemBackgroundPointerOver"); - [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBackgroundPointerOver")] - public static ThemeResourceKey PointerOver => new("ComboBoxItemBackgroundPointerOver"); + [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBackgroundDisabled")] + public static ThemeResourceKey Disabled => new("ComboBoxItemBackgroundDisabled"); - [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBackgroundDisabled")] - public static ThemeResourceKey Disabled => new("ComboBoxItemBackgroundDisabled"); - } + [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBackgroundSelected")] + public static ThemeResourceKey Selected => new("ComboBoxItemBackgroundSelected"); - public static class BackgroundSelected - { - [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBackgroundSelected")] - public static ThemeResourceKey Default => new("ComboBoxItemBackgroundSelected"); + [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBackgroundSelectedUnfocused")] + public static ThemeResourceKey SelectedUnfocused => new("ComboBoxItemBackgroundSelectedUnfocused"); - [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBackgroundSelectedUnfocused")] - public static ThemeResourceKey Unfocused => new("ComboBoxItemBackgroundSelectedUnfocused"); + [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBackgroundSelectedPressed")] + public static ThemeResourceKey SelectedPressed => new("ComboBoxItemBackgroundSelectedPressed"); - [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBackgroundSelectedPressed")] - public static ThemeResourceKey Pressed => new("ComboBoxItemBackgroundSelectedPressed"); + [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBackgroundSelectedPointerOver")] + public static ThemeResourceKey SelectedPointerOver => new("ComboBoxItemBackgroundSelectedPointerOver"); - [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBackgroundSelectedPointerOver")] - public static ThemeResourceKey PointerOver => new("ComboBoxItemBackgroundSelectedPointerOver"); + [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBackgroundSelectedDisabled")] + public static ThemeResourceKey SelectedDisabled => new("ComboBoxItemBackgroundSelectedDisabled"); + } - [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBackgroundSelectedDisabled")] - public static ThemeResourceKey Disabled => new("ComboBoxItemBackgroundSelectedDisabled"); - } + public static class BorderBrush + { + [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBorderBrush")] + public static ThemeResourceKey Default => new("ComboBoxItemBorderBrush"); - public static class BorderBrush - { - [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBorderBrush")] - public static ThemeResourceKey Default => new("ComboBoxItemBorderBrush"); + [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBorderBrushPressed")] + public static ThemeResourceKey Pressed => new("ComboBoxItemBorderBrushPressed"); - [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBorderBrushPressed")] - public static ThemeResourceKey Pressed => new("ComboBoxItemBorderBrushPressed"); + [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBorderBrushPointerOver")] + public static ThemeResourceKey PointerOver => new("ComboBoxItemBorderBrushPointerOver"); - [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBorderBrushPointerOver")] - public static ThemeResourceKey PointerOver => new("ComboBoxItemBorderBrushPointerOver"); + [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBorderBrushDisabled")] + public static ThemeResourceKey Disabled => new("ComboBoxItemBorderBrushDisabled"); - [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBorderBrushDisabled")] - public static ThemeResourceKey Disabled => new("ComboBoxItemBorderBrushDisabled"); - } + [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBorderBrushSelected")] + public static ThemeResourceKey Selected => new("ComboBoxItemBorderBrushSelected"); - public static class BorderBrushSelected - { - [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBorderBrushSelected")] - public static ThemeResourceKey Default => new("ComboBoxItemBorderBrushSelected"); + [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBorderBrushSelectedUnfocused")] + public static ThemeResourceKey SelectedUnfocused => new("ComboBoxItemBorderBrushSelectedUnfocused"); - [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBorderBrushSelectedUnfocused")] - public static ThemeResourceKey Unfocused => new("ComboBoxItemBorderBrushSelectedUnfocused"); + [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBorderBrushSelectedPressed")] + public static ThemeResourceKey SelectedPressed => new("ComboBoxItemBorderBrushSelectedPressed"); - [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBorderBrushSelectedPressed")] - public static ThemeResourceKey Pressed => new("ComboBoxItemBorderBrushSelectedPressed"); + [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBorderBrushSelectedPointerOver")] + public static ThemeResourceKey SelectedPointerOver => new("ComboBoxItemBorderBrushSelectedPointerOver"); - [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBorderBrushSelectedPointerOver")] - public static ThemeResourceKey PointerOver => new("ComboBoxItemBorderBrushSelectedPointerOver"); + [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBorderBrushSelectedDisabled")] + public static ThemeResourceKey SelectedDisabled => new("ComboBoxItemBorderBrushSelectedDisabled"); + } - [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemBorderBrushSelectedDisabled")] - public static ThemeResourceKey Disabled => new("ComboBoxItemBorderBrushSelectedDisabled"); + public static class PillFill + { + [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemPillFillBrush")] + public static ThemeResourceKey Default => new("ComboBoxItemPillFillBrush"); + } } - public static class PillFill + public static class DropDown { - [ResourceKeyDefinition(typeof(Brush), "ComboBoxItemPillFillBrush")] - public static ThemeResourceKey Default => new("ComboBoxItemPillFillBrush"); + public static class Foreground + { + [ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownForeground")] + public static ThemeResourceKey Default => new("ComboBoxDropDownForeground"); + } + + public static class GlyphForeground + { + [ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownGlyphForeground")] + public static ThemeResourceKey Default => new("ComboBoxDropDownGlyphForeground"); + + [ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownGlyphForegroundFocusedPressed")] + public static ThemeResourceKey FocusedPressed => new("ComboBoxDropDownGlyphForegroundFocusedPressed"); + + [ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownGlyphForegroundFocused")] + public static ThemeResourceKey Focused => new("ComboBoxDropDownGlyphForegroundFocused"); + + [ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownGlyphForegroundDisabled")] + public static ThemeResourceKey Disabled => new("ComboBoxDropDownGlyphForegroundDisabled"); + } + + public static class EditableGlyphForeground + { + [ResourceKeyDefinition(typeof(Brush), "ComboBoxEditableDropDownGlyphForeground")] + public static ThemeResourceKey Default => new("ComboBoxEditableDropDownGlyphForeground"); + } + public static class BorderBrush + { + [ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBorderBrush")] + public static ThemeResourceKey Default => new("ComboBoxDropDownBorderBrush"); + } + + public static class Background + { + [ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackground")] + public static ThemeResourceKey Default => new("ComboBoxDropDownBackground"); + + [ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackgroundPointerOver")] + public static ThemeResourceKey PointerOver => new("ComboBoxDropDownBackgroundPointerOver"); + + [ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackgroundPointerPressed")] + public static ThemeResourceKey PointerPressed => new("ComboBoxDropDownBackgroundPointerPressed"); + + [ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackgroundPressed")] + public static ThemeResourceKey Pressed => new("ComboBoxDropDownBackgroundPressed"); + + [ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackgroundFocused")] + public static ThemeResourceKey Focused => new("ComboBoxDropDownBackgroundFocused"); + + [ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackgroundFocusedPressed")] + public static ThemeResourceKey FocusedPressed => new("ComboBoxDropDownBackgroundFocusedPressed"); + } } - } - public static class DropDown - { - public static class GlyphForeground - { - [ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownGlyphForeground")] - public static ThemeResourceKey Default => new("ComboBoxDropDownGlyphForeground"); + [ResourceKeyDefinition(typeof(CornerRadius), "ComboBoxCornerRadius")] + public static ThemeResourceKey CornerRadius => new("ComboBoxCornerRadius"); - [ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownGlyphForegroundFocusedPressed")] - public static ThemeResourceKey FocusedPressed => new("ComboBoxDropDownGlyphForegroundFocusedPressed"); + [ResourceKeyDefinition(typeof(double), "ComboBoxHeight")] + public static ThemeResourceKey Height => new("ComboBoxHeight"); - [ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownGlyphForegroundFocused")] - public static ThemeResourceKey Focused => new("ComboBoxDropDownGlyphForegroundFocused"); + [ResourceKeyDefinition(typeof(double), "ComboBoxMinHeight")] + public static ThemeResourceKey MinHeight => new("ComboBoxMinHeight"); - [ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownGlyphForegroundDisabled")] - public static ThemeResourceKey Disabled => new("ComboBoxDropDownGlyphForegroundDisabled"); - } + [ResourceKeyDefinition(typeof(double), "ComboBoxDownGlyphWidth")] + public static ThemeResourceKey DownGlyphWidth => new("ComboBoxDownGlyphWidth"); - public static class Foreground - { - [ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownForeground")] - public static ThemeResourceKey Default => new("ComboBoxDropDownForeground"); - } - - public static class BorderBrush - { - [ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBorderBrush")] - public static ThemeResourceKey Default => new("ComboBoxDropDownBorderBrush"); - } + [ResourceKeyDefinition(typeof(double), "ComboBoxUpGlyphWidth")] + public static ThemeResourceKey UpGlyphWidth => new("ComboBoxUpGlyphWidth"); - public static class Background - { - [ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackground")] - public static ThemeResourceKey Default => new("ComboBoxDropDownBackground"); + [ResourceKeyDefinition(typeof(double), "ComboBoxDownGlyphHeight")] + public static ThemeResourceKey DownGlyphHeight => new("ComboBoxDownGlyphHeight"); - [ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackgroundPointerOver")] - public static ThemeResourceKey PointerOver => new("ComboBoxDropDownBackgroundPointerOver"); + [ResourceKeyDefinition(typeof(double), "ComboBoxUpGlyphHeight")] + public static ThemeResourceKey UpGlyphHeight => new("ComboBoxUpGlyphHeight"); - [ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackgroundPointerPressed")] - public static ThemeResourceKey PointerPressed => new("ComboBoxDropDownBackgroundPointerPressed"); + [ResourceKeyDefinition(typeof(Thickness), "ComboBoxDownGlyphMargin")] + public static ThemeResourceKey DownGlyphMargin => new("ComboBoxDownGlyphMargin"); - [ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackgroundPressed")] - public static ThemeResourceKey Pressed => new("ComboBoxDropDownBackgroundPressed"); + [ResourceKeyDefinition(typeof(Thickness), "ComboBoxUpGlyphMargin")] + public static ThemeResourceKey UpGlyphMargin => new("ComboBoxUpGlyphMargin"); - [ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackgroundFocused")] - public static ThemeResourceKey Focused => new("ComboBoxDropDownBackgroundFocused"); + [ResourceKeyDefinition(typeof(Thickness), "ComboBoxBorderThickness")] + public static ThemeResourceKey BorderThickness => new("ComboBoxBorderThickness"); - [ResourceKeyDefinition(typeof(Brush), "ComboBoxDropDownBackgroundFocusedPressed")] - public static ThemeResourceKey FocusedPressed => new("ComboBoxDropDownBackgroundFocusedPressed"); - } - } + [ResourceKeyDefinition(typeof(Thickness), "ComboBoxOpenedBorderThickness")] + public static ThemeResourceKey OpenedBorderThickness => new("ComboBoxOpenedBorderThickness"); - public static class EditableDropDown - { - public static class GlyphForeground - { - [ResourceKeyDefinition(typeof(Brush), "ComboBoxEditableDropDownGlyphForeground")] - public static ThemeResourceKey Default => new("ComboBoxEditableDropDownGlyphForeground"); - } + [ResourceKeyDefinition(typeof(Thickness), "ComboBoxPadding")] + public static ThemeResourceKey Padding => new("ComboBoxPadding"); } }