Skip to content

Commit 99d5f26

Browse files
committed
Merge pull request #96 from l1pton17/ListBoxDisplayMemberPathFox
Fix ListBox DisplayMemberPath
2 parents 29873b0 + 916e046 commit 99d5f26

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

MaterialDesignThemes.Wpf/Themes/Generic.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@
131131
</Canvas>
132132
<ContentPresenter Content="{TemplateBinding Content}"
133133
ContentTemplate="{TemplateBinding ContentTemplate}"
134+
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
134135
Margin="{TemplateBinding Padding}"
135136
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
136137
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ListBox.xaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@
8080
<ScaleTransform ScaleX="1"/>
8181
</Border.RenderTransform>
8282
</Border>
83-
8483
<wpf:Ripple Feedback="{TemplateBinding Foreground, Converter={StaticResource BrushRoundConverter}}"
8584
Focusable="False"
8685
Content="{TemplateBinding Content}"
8786
ContentTemplate="{TemplateBinding ContentTemplate}"
87+
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
8888
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
8989
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
9090
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
@@ -109,8 +109,10 @@
109109
<Setter Property="Template">
110110
<Setter.Value>
111111
<ControlTemplate TargetType="{x:Type ListBoxItem}">
112-
<wpf:Card Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}"
113-
ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"/>
112+
<wpf:Card Content="{TemplateBinding Content}"
113+
ContentTemplate="{TemplateBinding ContentTemplate}"
114+
ContentStringFormat="{TemplateBinding ContentStringFormat}"
115+
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"/>
114116
</ControlTemplate>
115117
</Setter.Value>
116118
</Setter>

0 commit comments

Comments
 (0)