Skip to content

Commit e948d94

Browse files
committed
little tidy ups on toolbars and list boxes
1 parent 54bc723 commit e948d94

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Button.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@
147147
<Ellipse Fill="{TemplateBinding Background}" Stroke="{TemplateBinding BorderBrush}" StrokeThickness="{TemplateBinding BorderThickness}" Effect="{DynamicResource MaterialDesignShadowDepth1}"
148148
x:Name="border" />
149149
<wpf:VisualFeedbackContentControl Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" Focusable="False"
150+
Feedback="White"
150151
Clip="{Binding ElementName=GeometryEllipse, Path=RenderedGeometry}" ClipToBounds="True"
151152
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
152153
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ListBox.xaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@
1717

1818
<Style x:Key="MaterialDesignListBoxItem" TargetType="{x:Type ListBoxItem}">
1919
<Setter Property="Background" Value="Transparent"/>
20+
<Setter Property="BorderThickness" Value="0"/>
2021
<Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
2122
<Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
2223
<Setter Property="Padding" Value="8" />
23-
<Setter Property="SnapsToDevicePixels" Value="True"/>
24+
<Setter Property="SnapsToDevicePixels" Value="True"/>
2425
<Setter Property="Template">
2526
<Setter.Value>
2627
<ControlTemplate TargetType="{x:Type ListBoxItem}">
@@ -135,6 +136,7 @@
135136
<Setter Property="Background" Value="Transparent"/>
136137
<Setter Property="BorderBrush" Value="Transparent"/>
137138
<Setter Property="BorderThickness" Value="0"/>
139+
<Setter Property="Foreground" Value="{DynamicResource MaterialDesignBody}"/>
138140
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
139141
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
140142
<Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
@@ -145,7 +147,7 @@
145147
<Setter Property="Template">
146148
<Setter.Value>
147149
<ControlTemplate TargetType="{x:Type ListBox}">
148-
<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="1" SnapsToDevicePixels="true">
150+
<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
149151
<ScrollViewer Focusable="false" Padding="{TemplateBinding Padding}">
150152
<ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
151153
</ScrollViewer>

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToolBar.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227
<Setter.Value>
228228
<ControlTemplate TargetType="{x:Type Button}">
229229
<wpf:VisualFeedbackContentControl Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" Focusable="False"
230-
Foreground="{TemplateBinding Foreground}"
230+
Feedback="{TemplateBinding Foreground}"
231231
ClipToBounds="False"
232232
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
233233
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"

0 commit comments

Comments
 (0)