Respect system settings for transparency effects and automatically hiding scroll bars (#167)

Author: Kinnara

ModernWpf.SampleApp/App.xaml

@@ -43,7 +43,6 @@
                 </ui:ThemeResources>
 
                 <ui:XamlControlsResources />
-                <sc:UISettingsResources />
 
                 <!-- Font Overrides -->
                 <!--<sc:FontOverrides FontFamily="Comic Sans MS" />-->

ModernWpf/Controls/XamlControlsResources.cs

@@ -13,6 +13,7 @@ public class XamlControlsResources : ResourceDictionary
         public XamlControlsResources()
         {
             MergedDictionaries.Add(ControlsResources);
+            MergedDictionaries.Add(UISettingsResources);
 
             if (DesignMode.DesignModeEnabled)
             {
@@ -65,8 +66,17 @@ internal static ResourceDictionary CompactResources
             }
         }
 
+        internal static ResourceDictionary UISettingsResources
+        {
+            get
+            {
+                return _uiSettingsResources ??= new UISettingsResources();
+            }
+        }
+
         private static ResourceDictionary _controlsResources;
         private static ResourceDictionary _compactResources;
+        private static ResourceDictionary _uiSettingsResources;
 
         private bool _useCompactResources;
     }

samples/SamplesCommon/UISettingsResources.cs ModernWpf/UISettingsResources.cs

@@ -1,14 +1,12 @@
-using System;
-using System.ComponentModel;
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Threading;
 using Windows.Foundation.Metadata;
 using Windows.UI.ViewManagement;
 
-namespace SamplesCommon
+namespace ModernWpf
 {
-    public class UISettingsResources : ResourceDictionary
+    internal class UISettingsResources : ResourceDictionary
     {
         private const string UniversalApiContractName = "Windows.Foundation.UniversalApiContract";
         private const string AutoHideScrollBarsKey = "AutoHideScrollBars";
@@ -17,23 +15,20 @@ public class UISettingsResources : ResourceDictionary
 
         public UISettingsResources()
         {
-            if (!DesignerProperties.GetIsInDesignMode(new DependencyObject()))
+            if (DesignMode.DesignModeEnabled)
             {
-                if (Environment.OSVersion.Version.Major >= 10)
-                {
-                    Initialize();
-                }
+                return;
+            }
+
+            if (OSVersionHelper.IsWindows10)
+            {
+                Initialize();
             }
         }
 
         [MethodImpl(MethodImplOptions.NoInlining)]
         private void Initialize()
         {
-            if (_uiSettings != null)
-            {
-                return;
-            }
-
             var uiSettings = new UISettings();
 
             if (ApiInformation.IsApiContractPresent(UniversalApiContractName, 4))
@@ -75,11 +70,6 @@ private void InitializeForContract8(UISettings settings)
             ApplyAutoHideScrollBars(settings.AutoHideScrollBars);
         }
 
-        private void ApplyAutoHideScrollBars(bool value)
-        {
-            this[AutoHideScrollBarsKey] = value;
-        }
-
         private void ApplyAdvancedEffectsEnabled(bool value)
         {
             var key = SystemParameters.DropShadowKey;
@@ -92,5 +82,10 @@ private void ApplyAdvancedEffectsEnabled(bool value)
                 this[key] = false;
             }
         }
+
+        private void ApplyAutoHideScrollBars(bool value)
+        {
+            this[AutoHideScrollBarsKey] = value;
+        }
     }
 }

samples/FluentRibbonSample/App.xaml

@@ -3,16 +3,13 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:ui="http://schemas.modernwpf.com/2019"
-    xmlns:local="clr-namespace:FluentRibbonSample"
-    xmlns:sc="clr-namespace:SamplesCommon;assembly=SamplesCommon"
     StartupUri="MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ui:ThemeResources RequestedTheme="Light" />
                 <ui:XamlControlsResources />
                 <ResourceDictionary Source="pack://application:,,,/Fluent;Component/Themes/Generic.xaml" />
-                <sc:UISettingsResources />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>

samples/FluentWPFSample/App.xaml

@@ -3,8 +3,6 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:ui="http://schemas.modernwpf.com/2019"
-    xmlns:local="clr-namespace:FluentWPFSample"
-    xmlns:sc="clr-namespace:SamplesCommon;assembly=SamplesCommon"
     StartupUri="MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary>
@@ -37,7 +35,6 @@
                 <!-- ModernWPF controls resources -->
                 <ui:XamlControlsResources />
 
-                <sc:UISettingsResources />
             </ResourceDictionary.MergedDictionaries>
 
         </ResourceDictionary>

samples/MahAppsSample/App.xaml

@@ -4,9 +4,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:ui="http://schemas.modernwpf.com/2019"
     xmlns:sc="clr-namespace:SamplesCommon;assembly=SamplesCommon"
-    xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
-    xmlns:local="clr-namespace:MahAppsSample"
-    xmlns:sys="clr-namespace:System;assembly=mscorlib"
     StartupUri="MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary>
@@ -33,7 +30,6 @@
                 <ui:XamlControlsResources />
                 <ResourceDictionary Source="/ModernWpf.MahApps;component/Styles/Controls.xaml" />
 
-                <sc:UISettingsResources />
             </ResourceDictionary.MergedDictionaries>
 
             <Style TargetType="ScrollViewer" BasedOn="{StaticResource DefaultScrollViewerStyle}">