Skip to content

Commit dc236b3

Browse files
committed
ux: makes all primitive controls apply the same theme
Signed-off-by: leo <longshuang@msn.cn>
1 parent 0f22ba9 commit dc236b3

1 file changed

Lines changed: 7 additions & 0 deletions

File tree

‎src/Resources/Styles.axaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1002,13 +1002,15 @@
10021002
<Setter Property="MinHeight" Value="20"/>
10031003
<Setter Property="VerticalAlignment" Value="Center"/>
10041004
<Setter Property="BorderBrush" Value="{DynamicResource Brush.Border1}"/>
1005+
<Setter Property="Background" Value="{DynamicResource Brush.Contents}"/>
10051006

10061007
<Style Selector="^ /template/ Popup#PART_Popup">
10071008
<Setter Property="Placement" Value="BottomEdgeAlignedLeft"/>
10081009
<Setter Property="VerticalOffset" Value="2"/>
10091010
</Style>
10101011
<Style Selector="^:pointerover /template/ Border#Background">
10111012
<Setter Property="BorderBrush" Value="{DynamicResource Brush.Accent}" />
1013+
<Setter Property="Background" Value="{DynamicResource Brush.Contents}"/>
10121014
</Style>
10131015
<Style Selector="^:disabled">
10141016
<Setter Property="Opacity" Value=".6"/>
@@ -1072,6 +1074,8 @@
10721074
</FocusAdornerTemplate>
10731075
</Setter>
10741076

1077+
<Setter Property="Foreground" Value="{DynamicResource Brush.FG1}"/>
1078+
10751079
<Setter Property="Template">
10761080
<ControlTemplate>
10771081
<Grid ColumnDefinitions="16,*" Background="Transparent">
@@ -1369,6 +1373,9 @@
13691373
</Style>
13701374

13711375
<Style Selector="NumericUpDown">
1376+
<Setter Property="Foreground" Value="{DynamicResource Brush.FG1}"/>
1377+
<Setter Property="Background" Value="{DynamicResource Brush.Contents}"/>
1378+
13721379
<Style Selector="^ /template/ ButtonSpinner#PART_Spinner">
13731380
<Setter Property="MinHeight" Value="0"/>
13741381
<Setter Property="Height" Value="28"/>

0 commit comments

Comments
 (0)