From db886e777b3b24742d72b704b694690383eee68b Mon Sep 17 00:00:00 2001
From: sakuraxp <sakura_xp@sina.com>
Date: Sun, 5 Jun 2022 03:07:05 +0800
Subject: [PATCH 1/4] =?UTF-8?q?feat.=E4=BC=98=E5=8C=96=EF=BC=8C=E5=BD=93?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E7=B3=BB=E7=BB=9F=E4=B8=8D=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?Windows=E7=B3=BB=E7=BB=9F=E6=8E=A8=E9=80=81=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E9=9A=90=E8=97=8F=E7=9B=B8=E5=BA=94=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E9=80=89=E9=A1=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UserControl/ToastSettingsUserControl.xaml | 86 +++++++------------
 .../ViewModels/SettingsViewModel.cs           | 40 +++------
 2 files changed, 43 insertions(+), 83 deletions(-)

diff --git a/src/MeoAsstGui/UserControl/ToastSettingsUserControl.xaml b/src/MeoAsstGui/UserControl/ToastSettingsUserControl.xaml
index 8efff9a2ff..8da08177c3 100644
--- a/src/MeoAsstGui/UserControl/ToastSettingsUserControl.xaml
+++ b/src/MeoAsstGui/UserControl/ToastSettingsUserControl.xaml
@@ -6,6 +6,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:s="https://github.com/canton7/Stylet" d:DesignHeight="300"
     xmlns:vm="clr-namespace:MeoAsstGui;assembly=MeoAsstGui"
+    xmlns:c="clr-namespace:CalcBinding;assembly=CalcBinding"
     d:DataContext="{d:DesignInstance {x:Type vm:SettingsViewModel}}"
     d:DesignWidth="550" mc:Ignorable="d">
     <Grid>
@@ -14,18 +15,28 @@
             <ColumnDefinition Width="100" />
         </Grid.ColumnDefinitions>
 
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="25*" />
-                <RowDefinition Height="44*" />
-                <RowDefinition Height="231*" />
-            </Grid.RowDefinitions>
-            <TextBlock
-                Margin="0,5,0,5" HorizontalAlignment="Center" Block.TextAlignment="Center"
-                Style="{StaticResource TextBlockDefault}" TextWrapping="Wrap"
-                Text="通知显示的位置，默认显示在屏幕的右下角，全不勾选则只有通知声音&#13;使用系统推送通知时此设置无效" Grid.Row="1" Width="372" />
+        <StackPanel>
+            <CheckBox 
+                x:Name="usesystemnote" Content="使用Windows系统推送通知（支持Win10/Win11）" HorizontalAlignment="Left" 
+                Margin="10,0,0,0" VerticalAlignment="Center"
+                IsChecked="{c:Binding ToastUsingSystem}" 
+                Visibility="{c:Binding ToastOS, FalseToVisibility=Collapsed}"
+                Height="20" Width="450"/>
 
-            <Grid Grid.Row="2">
+            <StackPanel Margin="0,5,0,5">
+                <TextBlock
+                HorizontalAlignment="Center" Block.TextAlignment="Center"
+                Style="{StaticResource TextBlockDefault}" TextWrapping="Wrap"
+                Text="通知显示的位置，默认显示在屏幕的右下角，全不勾选则只有通知声音"  Width="372" />
+                <TextBlock
+                HorizontalAlignment="Center" Block.TextAlignment="Center"
+                Style="{StaticResource TextBlockDefault}" TextWrapping="Wrap"
+                Text="使用系统推送通知时此设置无效"
+                Visibility="{c:Binding ToastOS, FalseToVisibility=Collapsed}" />
+            </StackPanel>
+            
+            <Border BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" CornerRadius="4" MaxWidth="400">
+                <Grid IsEnabled="{c:Binding !(ToastOS and ToastUsingSystem)}">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition />
                     <ColumnDefinition />
@@ -36,74 +47,41 @@
                     <RowDefinition />
                     <RowDefinition />
                 </Grid.RowDefinitions>
-                <Border
-                    Grid.Row="0" Grid.Column="0" BorderBrush="#E0E0E0" BorderThickness="1,1,0,0" />
-                <Border
-                    Grid.Row="1" Grid.Column="0" BorderBrush="#E0E0E0" BorderThickness="1,0,0,0" />
-                <Border
-                    Grid.Row="2" Grid.Column="0" BorderBrush="#E0E0E0" BorderThickness="1,0,0,1" />
-                <Border
-                    Grid.Row="0" Grid.Column="1" BorderBrush="#E0E0E0" BorderThickness="0,1,0,0" />
-                <Border
-                    Grid.Row="2" Grid.Column="1" BorderBrush="#E0E0E0" BorderThickness="0,0,0,1" />
-                <Border
-                    Grid.Row="0" Grid.Column="2" BorderBrush="#E0E0E0" BorderThickness="0,1,1,0" />
-                <Border
-                    Grid.Row="1" Grid.Column="2" BorderBrush="#E0E0E0" BorderThickness="0,0,1,0" />
-                <Border
-                    Grid.Row="2" Grid.Column="2" BorderBrush="#E0E0E0" BorderThickness="0,0,1,1" />
-
                 <CheckBox
                     Grid.Row="0" Grid.Column="0" Margin="16" HorizontalAlignment="Left"
                     VerticalAlignment="Top" Content="↖ 左上"
-                    IsChecked="{Binding ToastPositionTopLeft}" 
-                    IsEnabled="{Binding ToastControl}"/>
+                    IsChecked="{Binding ToastPositionTopLeft}"/>
                 <CheckBox
                     Grid.Row="1" Grid.Column="0" Margin="16" HorizontalAlignment="Left"
                     VerticalAlignment="Center" Content="← 左边"
-                    IsChecked="{Binding ToastPositionCenterLeft}" 
-                    IsEnabled="{Binding ToastControl}"/>
+                    IsChecked="{Binding ToastPositionCenterLeft}"/>
                 <CheckBox
                     Grid.Row="2" Grid.Column="0" Margin="16" HorizontalAlignment="Left"
                     VerticalAlignment="Bottom" Content="↙ 左下"
-                    IsChecked="{Binding ToastPositionBottomLeft}"
-                    IsEnabled="{Binding ToastControl}"/>
-
+                    IsChecked="{Binding ToastPositionBottomLeft}"/>
                 <CheckBox
                     Grid.Row="0" Grid.Column="1" Margin="16" HorizontalAlignment="Center"
                     VerticalAlignment="Top" Content="↑ 上边"
-                    IsChecked="{Binding ToastPositionTopCenter}" 
-                    IsEnabled="{Binding ToastControl}"/>
+                    IsChecked="{Binding ToastPositionTopCenter}"/>
                 <CheckBox
                     Grid.Row="2" Grid.Column="1" Margin="16" HorizontalAlignment="Center"
                     VerticalAlignment="Bottom" Content="↓ 下边"
-                    IsChecked="{Binding ToastPositionBottomCenter}" 
-                    IsEnabled="{Binding ToastControl}"/>
-
+                    IsChecked="{Binding ToastPositionBottomCenter}"/>
                 <CheckBox
                     Grid.Row="0" Grid.Column="2" Margin="16" HorizontalAlignment="Right"
                     VerticalAlignment="Top" Content="↗ 右上"
-                    IsChecked="{Binding ToastPositionTopRight}" 
-                    IsEnabled="{Binding ToastControl}"/>
+                    IsChecked="{Binding ToastPositionTopRight}"/>
                 <CheckBox
                     Grid.Row="1" Grid.Column="2" Margin="16" HorizontalAlignment="Right"
                     VerticalAlignment="Center" Content="→ 右边"
-                    IsChecked="{Binding ToastPositionCenterRight}" 
-                    IsEnabled="{Binding ToastControl}"/>
+                    IsChecked="{Binding ToastPositionCenterRight}"/>
                 <CheckBox
                     Grid.Row="2" Grid.Column="2" Margin="16" HorizontalAlignment="Right"
                     VerticalAlignment="Bottom" Content="↘ 右下"
-                    IsChecked="{Binding ToastPositionBottomRight}" 
-                    IsEnabled="{Binding ToastControl}"/>
+                    IsChecked="{Binding ToastPositionBottomRight}"/>
             </Grid>
-            <CheckBox 
-                x:Name="usesystemnote" Content="使用Windows系统推送通知（支持Win10/Win11）" HorizontalAlignment="Left" 
-                Margin="10,0,0,0" VerticalAlignment="Center"
-                IsChecked="{Binding ToastUsingSystem}" 
-                IsEnabled="{Binding ToastOS}"
-                Height="20" Width="450"/>
-        </Grid>
-
+            </Border>
+        </StackPanel>
         <Button
             Grid.Column="1" Height="36" MaxWidth="200" Margin="6"
             VerticalAlignment="Bottom"
diff --git a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs
index 42d3b575a5..3c0fe5fba0 100644
--- a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs
+++ b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs
@@ -571,46 +571,28 @@ namespace MeoAsstGui
 
         //是否使用系统通知
         private bool _toastUsingSystem = Convert.ToBoolean(ViewStatusStorage.Get("Toast.UsingSystem", bool.FalseString));
-        private bool _toastControl = Convert.ToBoolean(bool.TrueString);
-        private bool _toastOS = Convert.ToBoolean(bool.TrueString);
-        public bool toastOScheck()
-        {
-            var os = RuntimeInformation.OSDescription.ToString();
-            if (os.ToString().CompareTo("Microsoft Windows 10.0.10240") >= 0)
-            {
-                return true;
-            }
-            else
-            {
-                ViewStatusStorage.Set("Toast.UsingSystem", bool.FalseString);
-                ToastUsingSystem = false;
-                ToastControl = true;
-                return false;
-            }
-        }
         public bool ToastOS
         {
-            get { return toastOScheck(); }
-            set
+            get
             {
-                SetAndNotify(ref _toastOS, value);
-            }
-        }
-        public bool ToastControl
-        {
-            get { return !_toastUsingSystem; }
-            set
-            {
-                SetAndNotify(ref _toastControl, value);
+                var os = RuntimeInformation.OSDescription.ToString();
+                if (os.ToString().CompareTo("Microsoft Windows 10.0.10240") >= 0)
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
             }
         }
+
         public bool ToastUsingSystem
         {
             get { return _toastUsingSystem; }
             set
             {
                 SetAndNotify(ref _toastUsingSystem, value);
-                ToastControl = !Convert.ToBoolean(value);
                 ViewStatusStorage.Set("Toast.UsingSystem", value.ToString());
             }
         }

From 542469ce8d45404f4dbaabfa5d62ef73671413d1 Mon Sep 17 00:00:00 2001
From: sakuraxp <sakura_xp@sina.com>
Date: Sun, 5 Jun 2022 03:51:22 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix.=E4=BF=AE=E6=AD=A3=E4=BA=86=E5=9C=A8?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=90=AF=E7=94=A8=E8=80=8C?=
 =?UTF-8?q?=E5=AE=9E=E9=99=85=E4=B8=8D=E6=94=AF=E6=8C=81Windows=20?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E9=80=9A=E7=9F=A5=E7=9A=84=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MeoAsstGui/UserControl/ToastSettingsUserControl.xaml | 2 +-
 src/MeoAsstGui/ViewModels/SettingsViewModel.cs           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/MeoAsstGui/UserControl/ToastSettingsUserControl.xaml b/src/MeoAsstGui/UserControl/ToastSettingsUserControl.xaml
index 8da08177c3..7182c70e6f 100644
--- a/src/MeoAsstGui/UserControl/ToastSettingsUserControl.xaml
+++ b/src/MeoAsstGui/UserControl/ToastSettingsUserControl.xaml
@@ -19,7 +19,7 @@
             <CheckBox 
                 x:Name="usesystemnote" Content="使用Windows系统推送通知（支持Win10/Win11）" HorizontalAlignment="Left" 
                 Margin="10,0,0,0" VerticalAlignment="Center"
-                IsChecked="{c:Binding ToastUsingSystem}" 
+                IsChecked="{Binding ToastUsingSystem}" 
                 Visibility="{c:Binding ToastOS, FalseToVisibility=Collapsed}"
                 Height="20" Width="450"/>
 
diff --git a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs
index 3c0fe5fba0..bdf5137e5b 100644
--- a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs
+++ b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs
@@ -592,8 +592,8 @@ namespace MeoAsstGui
             get { return _toastUsingSystem; }
             set
             {
-                SetAndNotify(ref _toastUsingSystem, value);
-                ViewStatusStorage.Set("Toast.UsingSystem", value.ToString());
+                SetAndNotify(ref _toastUsingSystem, value && ToastOS);
+                ViewStatusStorage.Set("Toast.UsingSystem", (value && ToastOS).ToString());
             }
         }
 

From f70717c5cb47aeb91257acef4ca87a2abe396026 Mon Sep 17 00:00:00 2001
From: sakuraxp <sakura_xp@sina.com>
Date: Sun, 5 Jun 2022 04:13:18 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix.=E5=86=8D=E6=AC=A1=E4=BF=AEbug=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MeoAsstGui/ViewModels/SettingsViewModel.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs
index bdf5137e5b..b81ceba4d8 100644
--- a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs
+++ b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs
@@ -582,6 +582,10 @@ namespace MeoAsstGui
                 }
                 else
                 {
+                    if (ToastUsingSystem)
+                    {
+                        ToastUsingSystem = false;
+                    }
                     return false;
                 }
             }
@@ -592,14 +596,13 @@ namespace MeoAsstGui
             get { return _toastUsingSystem; }
             set
             {
-                SetAndNotify(ref _toastUsingSystem, value && ToastOS);
-                ViewStatusStorage.Set("Toast.UsingSystem", (value && ToastOS).ToString());
+                SetAndNotify(ref _toastUsingSystem, value);
+                ViewStatusStorage.Set("Toast.UsingSystem", value.ToString());
             }
         }
 
         //不使用系统通知时的设置
         // 左上
-        private bool _toastPositionTopLeft = ViewStatusStorage.Get("Toast.Position", string.Empty) == NotificationPosition.TopLeft.ToString();
 
         public bool ToastPositionTopLeft
         {

From 475aab0b66c5c9369c725c28ef082a5bee137886 Mon Sep 17 00:00:00 2001
From: sakuraxp <sakura_xp@sina.com>
Date: Sun, 5 Jun 2022 04:15:12 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix.=E6=81=A2=E5=A4=8D=E8=AF=AF=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E7=9A=84=E5=86=85=E5=AE=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MeoAsstGui/ViewModels/SettingsViewModel.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs
index b81ceba4d8..28b6c48bbc 100644
--- a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs
+++ b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs
@@ -603,6 +603,7 @@ namespace MeoAsstGui
 
         //不使用系统通知时的设置
         // 左上
+        private bool _toastPositionTopLeft = ViewStatusStorage.Get("Toast.Position", string.Empty) == NotificationPosition.TopLeft.ToString();
 
         public bool ToastPositionTopLeft
         {