Skip to content

Commit

Permalink
(GH-3391) Fix for: ItemContainerStyleSelector on ComboBox does not wo…
Browse files Browse the repository at this point in the history
…rk with MahApps

Closes #3391
  • Loading branch information
punker76 committed Dec 6, 2018
1 parent 6893565 commit c70a970
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 0 additions & 1 deletion src/MahApps.Metro/Styles/Controls.ComboBox.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,6 @@
<Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
<Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
<Setter Property="HorizontalContentAlignment" Value="Left" />
<Setter Property="ItemContainerStyle" Value="{DynamicResource MetroComboBoxItem}" />
<Setter Property="MinHeight" Value="26" />
<Setter Property="Padding" Value="2" />
<Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
Expand Down
6 changes: 4 additions & 2 deletions src/MahApps.Metro/Styles/Controls.StatusBar.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,16 @@
<Setter Property="Background" Value="{DynamicResource IdealForegroundColorBrush}" />
<Setter Property="MinHeight" Value="1" />
<Setter Property="MinWidth" Value="1" />
<Setter Property="Opacity" Value="0.75" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Separator}">
<Border Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
SnapsToDevicePixels="True" />
Opacity="{TemplateBinding Opacity}"
SnapsToDevicePixels="True"
UseLayoutRounding="True" />
</ControlTemplate>
</Setter.Value>
</Setter>
Expand All @@ -51,7 +54,6 @@
<Setter Property="FontStyle" Value="{DynamicResource {x:Static SystemFonts.StatusFontStyleKey}}" />
<Setter Property="FontWeight" Value="{DynamicResource {x:Static SystemFonts.StatusFontWeightKey}}" />
<Setter Property="Foreground" Value="{DynamicResource IdealForegroundColorBrush}" />
<Setter Property="ItemContainerStyle" Value="{DynamicResource MetroStatusBarItem}" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type StatusBar}">
Expand Down

0 comments on commit c70a970

Please # to comment.