From 4554769f38cb49c0447389cb3cbb385cd4a9cebb Mon Sep 17 00:00:00 2001
From: qhy040404 <qhy040404@163.com>
Date: Thu, 7 Mar 2024 23:36:19 +0800
Subject: [PATCH] real time mask settings

---
 BetterGenshinImpact/View/MaskWindow.xaml             | 12 ++++++------
 .../View/Pages/CommonSettingsPage.xaml               |  2 +-
 BetterGenshinImpact/ViewModel/MaskWindowViewModel.cs |  9 +--------
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/BetterGenshinImpact/View/MaskWindow.xaml b/BetterGenshinImpact/View/MaskWindow.xaml
index a9ac90e7..d87a83de 100644
--- a/BetterGenshinImpact/View/MaskWindow.xaml
+++ b/BetterGenshinImpact/View/MaskWindow.xaml
@@ -70,7 +70,7 @@
                              Foreground="LightGray"
                              IsHitTestVisible="False"
                              VerticalScrollBarVisibility="Hidden"
-                             Visibility="{Binding LogTextBoxVisibility, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                             Visibility="{Binding Config.MaskWindowConfig.ShowLogBox, Converter={StaticResource BooleanToVisibilityConverter}}" />
             </ContentControl>
 
             <!--<ContentControl Width="230"
@@ -115,7 +115,7 @@
                        Height="{Binding UidCoverRect.Height, Mode=OneWay}"
                        Fill="White"
                        IsHitTestVisible="False"
-                       Visibility="{Binding UidCoverVisibility, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                       Visibility="{Binding Config.MaskWindowConfig.UidCoverEnabled, Converter={StaticResource BooleanToVisibilityConverter}}" />
 
             <!--  方位  -->
             <Label Canvas.Left="{Binding EastPoint.X, Mode=OneWay}"
@@ -126,7 +126,7 @@
                    FontStretch="Medium"
                    FontWeight="DemiBold"
                    Foreground="White"
-                   Visibility="{Binding DirectionsVisibility, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                   Visibility="{Binding Config.MaskWindowConfig.DirectionsEnabled, Converter={StaticResource BooleanToVisibilityConverter}}" />
             <Label Canvas.Left="{Binding SouthPoint.X, Mode=OneWay}"
                    Canvas.Top="{Binding SouthPoint.Y, Mode=OneWay}"
                    HorizontalAlignment="Center"
@@ -135,7 +135,7 @@
                    FontStretch="Medium"
                    FontWeight="DemiBold"
                    Foreground="White"
-                   Visibility="{Binding DirectionsVisibility, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                   Visibility="{Binding Config.MaskWindowConfig.DirectionsEnabled, Converter={StaticResource BooleanToVisibilityConverter}}" />
             <Label Canvas.Left="{Binding WestPoint.X, Mode=OneWay}"
                    Canvas.Top="{Binding WestPoint.Y, Mode=OneWay}"
                    HorizontalAlignment="Center"
@@ -144,7 +144,7 @@
                    FontStretch="Medium"
                    FontWeight="DemiBold"
                    Foreground="White"
-                   Visibility="{Binding DirectionsVisibility, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                   Visibility="{Binding Config.MaskWindowConfig.DirectionsEnabled, Converter={StaticResource BooleanToVisibilityConverter}}" />
             <Label Canvas.Left="{Binding NorthPoint.X, Mode=OneWay}"
                    Canvas.Top="{Binding NorthPoint.Y, Mode=OneWay}"
                    HorizontalAlignment="Center"
@@ -153,7 +153,7 @@
                    FontStretch="Medium"
                    FontWeight="DemiBold"
                    Foreground="White"
-                   Visibility="{Binding DirectionsVisibility, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                   Visibility="{Binding Config.MaskWindowConfig.DirectionsEnabled, Converter={StaticResource BooleanToVisibilityConverter}}" />
         </Canvas>
     </AdornerDecorator>
 
diff --git a/BetterGenshinImpact/View/Pages/CommonSettingsPage.xaml b/BetterGenshinImpact/View/Pages/CommonSettingsPage.xaml
index 9984c73e..103c916e 100644
--- a/BetterGenshinImpact/View/Pages/CommonSettingsPage.xaml
+++ b/BetterGenshinImpact/View/Pages/CommonSettingsPage.xaml
@@ -43,7 +43,7 @@
                         Grid.Column="0"
                         Foreground="{ui:ThemeResource TextFillColorTertiaryBrush}"
                         TextWrapping="Wrap"
-                        Text="重启软件后生效，独占全屏模式下此模式不一定生效" />
+                        Text="实时生效，独占全屏模式下此模式不一定生效" />
                     <ui:ToggleSwitch
                         Grid.Row="0"
                         Grid.RowSpan="2"
diff --git a/BetterGenshinImpact/ViewModel/MaskWindowViewModel.cs b/BetterGenshinImpact/ViewModel/MaskWindowViewModel.cs
index a0a99ade..31221341 100644
--- a/BetterGenshinImpact/ViewModel/MaskWindowViewModel.cs
+++ b/BetterGenshinImpact/ViewModel/MaskWindowViewModel.cs
@@ -29,10 +29,6 @@ namespace BetterGenshinImpact.ViewModel
         [ObservableProperty] private Point _northPoint = new(150, -9);
 
 
-        [ObservableProperty] private bool _logTextBoxVisibility = true;
-        [ObservableProperty] private bool _uidCoverVisibility = true;
-        [ObservableProperty] private bool _directionsVisibility = true;
-
         public MaskWindowViewModel()
         {
             WeakReferenceMessenger.Default.Register<PropertyChangedMessage<object>>(this, (sender, msg) =>
@@ -83,10 +79,7 @@ namespace BetterGenshinImpact.ViewModel
             InitConfig();
             if (Config != null)
             {
-                LogTextBoxVisibility = Config.MaskWindowConfig.ShowLogBox;
-                UidCoverVisibility = Config.MaskWindowConfig.UidCoverEnabled;
-                DirectionsVisibility = Config.MaskWindowConfig.DirectionsEnabled;
-
+                OnPropertyChanged(nameof(Config));
                 // 比较特殊，必须要启动过任务调度器才能够获取到缩放信息
                 if (TaskContext.Instance().SystemInfo != null)
                 {