Skip to content

Commit b8783d8

Browse files
committed
Fix Expander Dark theme issue
Fix issue #274
1 parent b791505 commit b8783d8

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

MainDemo.Wpf/Expander.xaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@
1616
<Expander.Header>
1717
<TextBlock Text="Expander Example 1" />
1818
</Expander.Header>
19-
<Border Background="{StaticResource MaterialDesignBackground}" CornerRadius="5" Padding="5">
20-
<StackPanel Orientation="Vertical">
19+
<Border Background="{DynamicResource MaterialDesignBody}"
20+
CornerRadius="5" Padding="5">
21+
<StackPanel Orientation="Vertical"
22+
TextBlock.Foreground="{DynamicResource MaterialDesignPaper}">
2123
<TextBlock Text="A short text to proof functionality." />
2224
<TextBlock Margin="0,50,0,0" Text="A short text to proof functionality." />
2325
</StackPanel>

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Expander.xaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@
106106

107107
<Style x:Key="MaterialDesignExpander" TargetType="{x:Type Expander}">
108108
<Setter Property="Background" Value="{StaticResource MaterialDesignPaper}" />
109+
<Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}"/>
109110
<Setter Property="Template">
110111
<Setter.Value>
111112
<ControlTemplate TargetType="{x:Type Expander}">
@@ -173,9 +174,10 @@
173174
<ColumnDefinition Width="100*" />
174175
</Grid.ColumnDefinitions>
175176
<ToggleButton IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
176-
Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource TemplatedParent}}" OverridesDefaultStyle="True"
177+
OverridesDefaultStyle="True"
177178
Style="{StaticResource MaterialDesignExpanderToggleButton}" />
178-
<ToggleButton Grid.Column="1" IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
179+
<ToggleButton Grid.Column="1"
180+
IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
179181
Style="{StaticResource MaterialDesignExpanderHeaderToggleButton}">
180182
<ContentPresenter ContentSource="Header" HorizontalAlignment="Stretch" RecognizesAccessKey="True" VerticalAlignment="Center" />
181183
</ToggleButton>

0 commit comments

Comments
 (0)