|
43 | 43 | <SolidColorBrush x:Key="BasisBorderStrongBrush" Color="{StaticResource BasisBorderStrong}"/> |
44 | 44 | <SolidColorBrush x:Key="BasisGlassBrush" Color="{StaticResource BasisGlass}"/> |
45 | 45 | <SolidColorBrush x:Key="BasisGlassStrongBrush" Color="{StaticResource BasisGlassStrong}"/> |
| 46 | + <!-- Override the Fluent ComboBox dropdown-popup fill to the dark scheme (backup for the |
| 47 | + ComboBox /template/ Border#PopupBorder selector); Fluent's default is light/translucent. --> |
| 48 | + <SolidColorBrush x:Key="ComboBoxDropDownBackground" Color="{StaticResource BasisSurface}"/> |
46 | 49 | <SolidColorBrush x:Key="BasisTextPrimaryBrush" Color="{StaticResource BasisTextPrimary}"/> |
47 | 50 | <SolidColorBrush x:Key="BasisTextMutedBrush" Color="{StaticResource BasisTextMuted}"/> |
48 | 51 | <SolidColorBrush x:Key="BasisTextSecondaryBrush" Color="{StaticResource BasisTextSecondary}"/> |
|
344 | 347 | <Setter Property="Background" Value="Transparent"/> |
345 | 348 | <Setter Property="Padding" Value="12,8"/> |
346 | 349 | </Style> |
| 350 | + <!-- Dropdown popup + item states: match the dark scheme. Fluent's defaults are a light/ |
| 351 | + translucent popup and a blue accent highlight, which don't match the Basis palette. --> |
| 352 | + <Style Selector="ComboBox /template/ Border#PopupBorder"> |
| 353 | + <Setter Property="Background" Value="{StaticResource BasisSurfaceBrush}"/> |
| 354 | + <Setter Property="BorderBrush" Value="{StaticResource BasisBorderStrongBrush}"/> |
| 355 | + <Setter Property="BorderThickness" Value="1"/> |
| 356 | + <Setter Property="CornerRadius" Value="10"/> |
| 357 | + </Style> |
| 358 | + <Style Selector="ComboBoxItem:pointerover /template/ ContentPresenter#PART_ContentPresenter"> |
| 359 | + <Setter Property="Background" Value="{StaticResource BasisSurfaceHoverBrush}"/> |
| 360 | + <Setter Property="TextElement.Foreground" Value="{StaticResource BasisTextPrimaryBrush}"/> |
| 361 | + </Style> |
| 362 | + <Style Selector="ComboBoxItem:selected /template/ ContentPresenter#PART_ContentPresenter"> |
| 363 | + <Setter Property="Background" Value="{StaticResource BasisSurfaceHoverBrush}"/> |
| 364 | + <Setter Property="TextElement.Foreground" Value="{StaticResource BasisTextPrimaryBrush}"/> |
| 365 | + </Style> |
| 366 | + <Style Selector="ComboBoxItem:selected:pointerover /template/ ContentPresenter#PART_ContentPresenter"> |
| 367 | + <Setter Property="Background" Value="{StaticResource BasisSurfaceHoverBrush}"/> |
| 368 | + <Setter Property="TextElement.Foreground" Value="{StaticResource BasisTextPrimaryBrush}"/> |
| 369 | + </Style> |
347 | 370 |
|
348 | 371 | <Style Selector="CheckBox"> |
349 | 372 | <Setter Property="Foreground" Value="{StaticResource BasisTextPrimaryBrush}"/> |
|
0 commit comments