zhaoyushun1999/Semi.Avalonia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: ComboBox.

Browse Source
This commit is contained in:
Zhang Dian 2024-09-25 20:57:09 +08:00
parent 5c8f2f7075
commit 25c3e874f3
5 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Semi.Avalonia/Controls/ComboBox.axaml
View File

@ -32,6 +32,7 @@
<Setter Property="FocusAdorner" Value="{x:Null}" />
<Setter Property="MaxDropDownHeight" Value="504" />
<Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorBorderBrush}" />
<Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="Cursor" Value="Hand" />
@ -114,8 +115,7 @@
ClipToBounds="False"
InheritsTransform="True"
IsLightDismissEnabled="True"
IsOpen="{TemplateBinding IsDropDownOpen,
Mode=TwoWay}"
IsOpen="{TemplateBinding IsDropDownOpen, Mode=TwoWay}"
PlacementTarget="Background"
WindowManagerAddShadowHint="False">
<Border
@ -194,6 +194,7 @@
<!-- Disabled State -->
<Style Selector="^:disabled">
<Setter Property="Background" Value="{DynamicResource ComboBoxSelectorDisabledBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorDisabledBorderBrush}" />
<Style Selector="^ /template/ ContentControl#ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource ComboBoxDisabledForeground}" />
</Style>
@ -299,10 +300,12 @@
</Setter>
<Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource ComboBoxItemPointeroverForeground}" />
<Setter Property="Background" Value="{DynamicResource ComboBoxItemPointeroverBackground}" />
</Style>
<Style Selector="^:focus /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource ComboBoxItemFocusForeground}" />
<Setter Property="Background" Value="{DynamicResource ComboBoxItemFocusBackground}" />
</Style>
@ -311,10 +314,12 @@
</Style>
<Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource ComboBoxItemPressedForeground}" />
<Setter Property="Background" Value="{DynamicResource ComboBoxItemPressedBackground}" />
</Style>
<Style Selector="^:selected">
<Setter Property="Foreground" Value="{DynamicResource ComboBoxItemSelectedForeground}" />
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Background" Value="{DynamicResource ComboBoxItemSelectedBackground}" />
</Style>

5
src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
View File

@ -4,6 +4,7 @@
<SolidColorBrush x:Key="ComboBoxSelectorFocusBackground" Opacity="0.16" Color="White" />
<SolidColorBrush x:Key="ComboBoxSelectorPressedBackground" Opacity="0.20" Color="White" />
<SolidColorBrush x:Key="ComboBoxSelectorDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
<SolidColorBrush x:Key="ComboBoxSelectorDisabledBorderBrush" Opacity="0.04" Color="#E6E8EA" />
<SolidColorBrush x:Key="ComboBoxSelectorBorderBrush" Color="Transparent" />
<SolidColorBrush x:Key="ComboBoxSelectorPointeroverBorderBrush" Color="Transparent" />
<SolidColorBrush x:Key="ComboBoxSelectorFocusBorderBrush" Color="#54A9FF" />
@ -24,9 +25,13 @@
<SolidColorBrush x:Key="ComboBoxItemForeground" Color="#F9F9F9" />
<SolidColorBrush x:Key="ComboBoxItemBackground" Color="Transparent" />
<SolidColorBrush x:Key="ComboBoxItemPointeroverForeground" Color="#F9F9F9" />
<SolidColorBrush x:Key="ComboBoxItemPointeroverBackground" Opacity="0.12" Color="White" />
<SolidColorBrush x:Key="ComboBoxItemFocusForeground" Color="#F9F9F9" />
<SolidColorBrush x:Key="ComboBoxItemFocusBackground" Opacity="0.12" Color="White" />
<SolidColorBrush x:Key="ComboBoxItemPressedForeground" Color="#F9F9F9" />
<SolidColorBrush x:Key="ComboBoxItemPressedBackground" Opacity="0.16" Color="White" />
<SolidColorBrush x:Key="ComboBoxItemSelectedForeground" Color="#F9F9F9" />
<SolidColorBrush x:Key="ComboBoxItemSelectedBackground" Opacity="0.2" Color="#54A9FF" />
<SolidColorBrush x:Key="ComboBoxItemSelectedPointeroverBackground" Opacity="0.3" Color="#54A9FF" />

6
src/Semi.Avalonia/Themes/Dark/ListBox.axaml
View File

@ -3,11 +3,11 @@
<SolidColorBrush x:Key="ListBoxItemDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
<SolidColorBrush x:Key="ListBoxItemDefaultBackground" Color="Transparent" />
<SolidColorBrush x:Key="ListBoxItemPointeroverForeground" Color="White" />
<SolidColorBrush x:Key="ListBoxItemPointeroverForeground" Color="#F9F9F9" />
<SolidColorBrush x:Key="ListBoxItemPointeroverBackground" Opacity="0.12" Color="White" />
<SolidColorBrush x:Key="ListBoxItemPressedForeground" Color="White" />
<SolidColorBrush x:Key="ListBoxItemPressedForeground" Color="#F9F9F9" />
<SolidColorBrush x:Key="ListBoxItemPressedBackground" Opacity="0.16" Color="White" />
<SolidColorBrush x:Key="ListBoxItemSelectedForeground" Color="White" />
<SolidColorBrush x:Key="ListBoxItemSelectedForeground" Color="#F9F9F9" />
<SolidColorBrush x:Key="ListBoxItemSelectedBackground" Opacity="0.2" Color="#54A9FF" />
<SolidColorBrush x:Key="ListBoxItemSelectedPointeroverBackground" Opacity="0.3" Color="#54A9FF" />
<SolidColorBrush x:Key="ListBoxItemDisabledBackground" Color="Transparent" />

21
src/Semi.Avalonia/Themes/HighContrast/Base.axaml
View File

@ -109,11 +109,6 @@
<SolidColorBrush x:Key="CalendarDatePickerDisabledIconForeground" Color="{StaticResource GrayTextColor}" />
<SolidColorBrush x:Key="CalendarDatePickerBorderBrush" Color="{StaticResource WindowTextColor}" />
<SolidColorBrush x:Key="CalendarDatePickerBorderedDefaultBackground" Color="{StaticResource WindowColor}" />
<SolidColorBrush x:Key="CalendarDatePickerBorderedDefaultBorderBrush" Color="{StaticResource WindowTextColor}" />
<SolidColorBrush x:Key="CalendarDatePickerBorderedPointeroverBackground" Color="{StaticResource WindowColor}" />
<SolidColorBrush x:Key="CalendarDatePickerBorderedPointeroverBorderBrush" Color="{StaticResource HotlightColor}" />
<!-- CaptionButtons -->
<SolidColorBrush x:Key="CaptionButtonPointeroverBackground" Color="{StaticResource HotlightColor}" />
<SolidColorBrush x:Key="CaptionButtonPressedBackground" Color="{StaticResource HotlightColor}" />
@ -161,6 +156,7 @@
<SolidColorBrush x:Key="ComboBoxSelectorFocusBackground" Color="{StaticResource WindowColor}" />
<SolidColorBrush x:Key="ComboBoxSelectorPressedBackground" Color="{StaticResource WindowColor}" />
<SolidColorBrush x:Key="ComboBoxSelectorDisabledBackground" Color="{StaticResource WindowColor}" />
<SolidColorBrush x:Key="ComboBoxSelectorDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
<SolidColorBrush x:Key="ComboBoxSelectorBorderBrush" Color="{StaticResource WindowTextColor}" />
<SolidColorBrush x:Key="ComboBoxSelectorPointeroverBorderBrush" Color="{StaticResource HotlightColor}" />
<SolidColorBrush x:Key="ComboBoxSelectorFocusBorderBrush" Color="{StaticResource HotlightColor}" />
@ -177,27 +173,22 @@
<SolidColorBrush x:Key="ComboBoxPopupBackground" Color="{StaticResource WindowColor}" />
<SolidColorBrush x:Key="ComboBoxPopupBorderBrush" Color="{StaticResource WindowTextColor}" />
<SolidColorBrush x:Key="ComboBoxItemForeground" Color="#F9F9F9" />
<SolidColorBrush x:Key="ComboBoxItemForeground" Color="{StaticResource WindowTextColor}" />
<SolidColorBrush x:Key="ComboBoxItemBackground" Color="{StaticResource WindowColor}" />
<SolidColorBrush x:Key="ComboBoxItemPointeroverForeground" Color="{StaticResource HighlightTextColor}" />
<SolidColorBrush x:Key="ComboBoxItemPointeroverBackground" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="ComboBoxItemFocusForeground" Color="{StaticResource HighlightTextColor}" />
<SolidColorBrush x:Key="ComboBoxItemFocusBackground" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="ComboBoxItemPressedForeground" Color="{StaticResource HighlightTextColor}" />
<SolidColorBrush x:Key="ComboBoxItemPressedBackground" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="ComboBoxItemSelectedForeground" Color="{StaticResource HighlightTextColor}" />
<SolidColorBrush x:Key="ComboBoxItemSelectedBackground" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="ComboBoxItemSelectedPointeroverBackground" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="ComboBoxItemDisabledBackground" Color="{StaticResource WindowColor}" />
<SolidColorBrush x:Key="ComboBoxItemSelectedDisabledBackground" Color="{StaticResource WindowColor}" />
<SolidColorBrush x:Key="ComboBoxSelectorBorderedBackground" Color="{StaticResource WindowColor}" />
<SolidColorBrush x:Key="ComboBoxSelectorBorderedBorderBrush" Color="{StaticResource WindowTextColor}" />
<SolidColorBrush x:Key="ComboBoxSelectorBorderedPointeroverBackground" Color="{StaticResource WindowColor}" />
<SolidColorBrush x:Key="ComboBoxSelectorBorderedPointeroverBorderBrush" Color="{StaticResource HotlightColor}" />
<SolidColorBrush x:Key="ComboBoxSelectorBorderedFocusBackground" Color="{StaticResource WindowColor}" />
<SolidColorBrush x:Key="ComboBoxSelectorBorderedFocusBorderBrush" Color="{StaticResource HotlightColor}" />
<SolidColorBrush x:Key="ComboBoxSelectorBorderedPressedBackground" Color="{StaticResource WindowColor}" />
<SolidColorBrush x:Key="ComboBoxSelectorBorderedPressedBorderBrush" Color="{StaticResource HotlightColor}" />
<!-- DateTimePickerShared -->
<SolidColorBrush x:Key="DateTimePickerListItemBackground" Color="{StaticResource WindowColor}" />
<SolidColorBrush x:Key="DateTimePickerPopupBackground" Color="{StaticResource WindowColor}" />

5
src/Semi.Avalonia/Themes/Light/ComboBox.axaml
View File

@ -4,6 +4,7 @@
<SolidColorBrush x:Key="ComboBoxSelectorFocusBackground" Opacity="0.09" Color="#2E3238" />
<SolidColorBrush x:Key="ComboBoxSelectorPressedBackground" Opacity="0.13" Color="#2E3238" />
<SolidColorBrush x:Key="ComboBoxSelectorDisabledBackground" Opacity="0.02" Color="#2E3238" />
<SolidColorBrush x:Key="ComboBoxSelectorDisabledBorderBrush" Opacity="0.02" Color="#2E3238" />
<SolidColorBrush x:Key="ComboBoxSelectorBorderBrush" Color="Transparent" />
<SolidColorBrush x:Key="ComboBoxSelectorPointeroverBorderBrush" Color="Transparent" />
<SolidColorBrush x:Key="ComboBoxSelectorFocusBorderBrush" Color="#0077FA" />
@ -23,9 +24,13 @@
<SolidColorBrush x:Key="ComboBoxItemForeground" Color="#1C1F23" />
<SolidColorBrush x:Key="ComboBoxItemBackground" Color="Transparent" />
<SolidColorBrush x:Key="ComboBoxItemPointeroverForeground" Color="#1C1F23" />
<SolidColorBrush x:Key="ComboBoxItemPointeroverBackground" Opacity="0.05" Color="#2E3238" />
<SolidColorBrush x:Key="ComboBoxItemFocusForeground" Color="#1C1F23" />
<SolidColorBrush x:Key="ComboBoxItemFocusBackground" Opacity="0.05" Color="#2E3238" />
<SolidColorBrush x:Key="ComboBoxItemPressedForeground" Color="#1C1F23" />
<SolidColorBrush x:Key="ComboBoxItemPressedBackground" Opacity="0.09" Color="#2E3238" />
<SolidColorBrush x:Key="ComboBoxItemSelectedForeground" Color="#1C1F23" />
<SolidColorBrush x:Key="ComboBoxItemSelectedBackground" Color="#EAF5FF" />
<SolidColorBrush x:Key="ComboBoxItemSelectedPointeroverBackground" Color="#CBE7FE" />