Fixes #272 by using ParentBackstage.Background as ItemsPanelBackgroun…

…d in Office 2013 theme
fluentribbon · Feb 16, 2016 · d636b13 · d636b13
1 parent 0695c0c
commit d636b13
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Fluent.Ribbon.Showcase/ViewModels/ColorViewModel.cs b/Fluent.Ribbon.Showcase/ViewModels/ColorViewModel.cs
@@ -1,5 +1,6 @@
 namespace FluentTest.ViewModels
 {
+    using System.Windows;
     using System.Windows.Media;
 
     public class ColorViewModel : ViewModel
@@ -14,7 +15,6 @@ public ColorViewModel()
         {
             this.StandardColor = Colors.Black;
             this.HighlightColor = Colors.Yellow;
-            this.ThemeColor = Colors.Blue;
         }
 
         public Color StandardColor
@@ -44,10 +44,10 @@ public Color[] ThemeColors
 
         public Color ThemeColor
         {
-            get { return this.themeColor; }
+            get { return ((SolidColorBrush)Application.Current.Resources["RibbonThemeColorBrush"]).Color; }
             set
             {
-                this.themeColor = value;
+                Application.Current.Resources["RibbonThemeColorBrush"] = new SolidColorBrush(value);
                 this.OnPropertyChanged("ThemeColor");
             }
         }

diff --git a/Fluent.Ribbon/Themes/Office2013/Controls/BackstageTabControl.xaml b/Fluent.Ribbon/Themes/Office2013/Controls/BackstageTabControl.xaml
@@ -289,6 +289,6 @@
         <Setter Property="Background"
                 Value="{Binding ParentBackstage.Background, RelativeSource={RelativeSource Self}, FallbackValue=Red}" />
         <Setter Property="ItemsPanelBackground"
-                Value="{DynamicResource BackstagePanelBackgroundBrush}" />
+                Value="{Binding ParentBackstage.Background, RelativeSource={RelativeSource Self}, FallbackValue=Red}" />
     </Style>
 </ResourceDictionary>