Fixes #576 by making header foreground consistent

fluentribbon · Jul 5, 2018 · 7ed19d1 · 7ed19d1
1 parent 3b4a613
commit 7ed19d1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Changelog.md b/Changelog.md
@@ -60,6 +60,7 @@
   - [#564](../../issues/564) - Gallery overflow panel (with menu items) doesn't close when clicking once in the application
   - [#572](../../issues/572) - KeyTip.Keys Position
   - [#573](../../issues/573) - Empty context menu on controls and ribbon
+  - [#576](../../issues/576) - Does RibbonGroupBox set Foreground invalid?
   - [#581](../../issues/581) - StackOverflow Exception when trying to access ApplicationMenu while RibbonMenu is minimized
 
 - ### Enhancements

diff --git a/Fluent.Ribbon/Themes/Controls/RibbonGroupBox.xaml b/Fluent.Ribbon/Themes/Controls/RibbonGroupBox.xaml
@@ -35,7 +35,6 @@
 
     <DataTemplate x:Key="Fluent.Ribbon.Templates.RibbonGroupBox.TwoLineHeaderTemplate">
         <Fluent:TwoLineLabel Text="{Binding}"
-                             Foreground="{DynamicResource Fluent.Ribbon.Brushes.RibbonGroupBox.Header.Foreground}"
                              HorizontalAlignment="Center"
                              VerticalAlignment="Center"
                              HasGlyph="True" />
@@ -296,6 +295,7 @@
                                             ContentStringFormat="{TemplateBinding HeaderStringFormat}"
                                             ContentTemplate="{TemplateBinding HeaderTemplate}"
                                             ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
+                                            Foreground="{DynamicResource Fluent.Ribbon.Brushes.RibbonGroupBox.Header.Foreground}"
                                             HorizontalAlignment="Stretch"
                                             VerticalAlignment="Center"
                                             Margin="2,0" />
@@ -337,6 +337,7 @@
                                     ContentStringFormat="{TemplateBinding HeaderStringFormat}"
                                     ContentTemplate="{TemplateBinding HeaderTemplate}"
                                     ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
+                                    Foreground="{DynamicResource Fluent.Ribbon.Brushes.RibbonGroupBox.Header.Foreground}"
                                     Style="{DynamicResource Fluent.Ribbon.Styles.RibbonGroupBox.TwoLineHeaderContentControl}"
                                     Fluent:RibbonGroupBox.IsCollapsedHeaderContentPresenter="True"
                                     HorizontalAlignment="Center"