Rename SystemTheme.Theme property to SystemTheme.AppTheme

sourcechord · Oct 13, 2019 · 3991d3e · 3991d3e
1 parent b2e956e
commit 3991d3e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/FluentWPF/Resources/ResourceDictionaryEx.cs b/FluentWPF/Resources/ResourceDictionaryEx.cs
@@ -146,7 +146,7 @@ private void ChangeTheme()
                     break;
                 case ElementTheme.Default:
                 default:
-                    this.ChangeTheme(SystemTheme.Theme.ToString());
+                    this.ChangeTheme(SystemTheme.AppTheme.ToString());
                     break;
             }
         }

diff --git a/FluentWPF/Resources/SystemTheme.cs b/FluentWPF/Resources/SystemTheme.cs
@@ -29,7 +29,7 @@ public class SystemTheme : ThemeHandler
         static SystemTheme()
         {
             SystemTheme.Instance = new SystemTheme();
-            Theme = GetTheme();
+            AppTheme = GetAppTheme();
             WindowsTheme = GetWindowsTheme();
         }
 
@@ -41,7 +41,7 @@ protected override IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lP
                 if (systemParmeter == "ImmersiveColorSet")
                 {
                     // 再度レジストリから Dark/Lightの設定を取得
-                    Theme = GetTheme();
+                    AppTheme = GetAppTheme();
                     WindowsTheme = GetWindowsTheme();
                     SystemTheme.ThemeChanged?.Invoke(null, null);
 
@@ -52,7 +52,7 @@ protected override IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lP
             return IntPtr.Zero;
         }
 
-        private static ApplicationTheme GetTheme()
+        private static ApplicationTheme GetAppTheme()
         {
             var regkey = Microsoft.Win32.Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize", false);
             // キーが存在しないときはnullが返る
@@ -72,11 +72,11 @@ private static WindowsTheme GetWindowsTheme()
             return intValue == 0 ? WindowsTheme.Dark : WindowsTheme.Light;
         }
 
-        private static ApplicationTheme theme;
-        public static ApplicationTheme Theme
+        private static ApplicationTheme appTheme;
+        public static ApplicationTheme AppTheme
         {
-            get { return theme; }
-            private set { if (!object.Equals(theme, value)) { theme = value; OnStaticPropertyChanged(); } }
+            get { return appTheme; }
+            private set { if (!object.Equals(appTheme, value)) { appTheme = value; OnStaticPropertyChanged(); } }
         }
 
         private static WindowsTheme windowsTheme;

diff --git a/Sample/FluentWPFSample/Views/AccentColorsSample.xaml b/Sample/FluentWPFSample/Views/AccentColorsSample.xaml
@@ -50,11 +50,11 @@
                         <TextBlock Text="Application Theme"/>
                         <RadioButton Content="Light"
                                      IsEnabled="False"
-                                     IsChecked="{Binding Path=(fw:SystemTheme.Theme),
+                                     IsChecked="{Binding Path=(fw:SystemTheme.AppTheme),
                                      Converter={StaticResource radioButtonConverter}, ConverterParameter=Light, Mode=OneWay}"/>
                         <RadioButton Content="Dark"
                                      IsEnabled="False"
-                                     IsChecked="{Binding Path=(fw:SystemTheme.Theme),
+                                     IsChecked="{Binding Path=(fw:SystemTheme.AppTheme),
                                      Converter={StaticResource radioButtonConverter}, ConverterParameter=Dark, Mode=OneWay}"/>
                     </StackPanel>
                 </Border>