From 7ed19d1e3fece073776301d4466eb217d340b812 Mon Sep 17 00:00:00 2001 From: Bastian Schmidt Date: Thu, 5 Jul 2018 18:39:30 +0200 Subject: [PATCH] Fixes #576 by making header foreground consistent --- Changelog.md | 1 + Fluent.Ribbon/Themes/Controls/RibbonGroupBox.xaml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 979e4e402..e0cba3a4f 100644 --- 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 index 07eab426b..7f1a0273f 100644 --- a/Fluent.Ribbon/Themes/Controls/RibbonGroupBox.xaml +++ b/Fluent.Ribbon/Themes/Controls/RibbonGroupBox.xaml @@ -35,7 +35,6 @@ @@ -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"