Fixes #294 by removing OverridesDefaultStyle on some styles

fluentribbon · Apr 11, 2016 · 6e924fc · 6e924fc
1 parent d6bdd25
commit 6e924fc
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,10 @@
 # Changelog for Fluent.Ribbon
 
+## 4.0.2
+
+- ### Bug fixes
+  - [#294](../../issues/294) - Issues with default style and OverridesDefaultStyle
+
 ## 4.0.1
 
 - ### Bug fixes

diff --git a/Fluent.Ribbon/Controls/Ribbon.cs b/Fluent.Ribbon/Controls/Ribbon.cs
@@ -2224,7 +2224,10 @@ private void LoadState(Stream stream)
                 }
 
                 // Since application is not fully loaded we have to delay the refresh
-                this.ribbon.RunInDispatcherAsync(this.ribbon.QuickAccessToolBar.Refresh, DispatcherPriority.Background);
+                if (this.ribbon.QuickAccessToolBar != null)
+                {
+                    this.ribbon.RunInDispatcherAsync(this.ribbon.QuickAccessToolBar.Refresh, DispatcherPriority.Background);
+                }
 
                 // Sync QAT menu items
                 foreach (var menuItem in this.ribbon.QuickAccessItems)

diff --git a/Fluent.Ribbon/Themes/Office2010/Controls/BackstageTabControl.xaml b/Fluent.Ribbon/Themes/Office2010/Controls/BackstageTabControl.xaml
@@ -256,8 +256,6 @@
 
     <Style x:Key="BackstageStyle"
            TargetType="{x:Type Fluent:BackstageTabControl}">
-        <Setter Property="OverridesDefaultStyle"
-                Value="True" />
         <Setter Property="Foreground"
                 Value="{DynamicResource DefaultFontBrush}" />
         <Setter Property="Template"

diff --git a/Fluent.Ribbon/Themes/Office2010/Controls/StartScreenTabControl.xaml b/Fluent.Ribbon/Themes/Office2010/Controls/StartScreenTabControl.xaml
@@ -5,8 +5,6 @@
     <Style x:Key="StartScreenTabControlStyle"
            TargetType="{x:Type Fluent:StartScreenTabControl}"
            BasedOn="{StaticResource {x:Type Fluent:BackstageTabControl}}">
-        <Setter Property="OverridesDefaultStyle"
-                Value="True" />
         <Setter Property="Template"
                 Value="{DynamicResource StartScreenTabControlTemplate}" />
         <Setter Property="Background"

diff --git a/Shared/GlobalAssemblyInfo.cs b/Shared/GlobalAssemblyInfo.cs
@@ -15,8 +15,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("4.0.1.0")]
-[assembly: AssemblyFileVersion("4.0.1.0")]
+[assembly: AssemblyVersion("4.0.2.0")]
+[assembly: AssemblyFileVersion("4.0.2.0")]
 [assembly: AssemblyInformationalVersion("SRC")]
 
 [assembly: ComVisible(false)]

diff --git a/appveyor.yml b/appveyor.yml
@@ -6,7 +6,7 @@
     only:
       - develop
 
-  version: 4.0.1-dev{build}
+  version: 4.0.2-dev{build}
   configuration: Release
 
   init:
@@ -49,7 +49,7 @@
     only:
       - master
 
-  version: 4.0.1.{build}
+  version: 4.0.2.{build}
   configuration: Release
 
   # Install scripts. (runs after repo cloning)