From b9f0fe9ec9916a1e26163fc12f6b648b4d579b3b Mon Sep 17 00:00:00 2001
From: XY Wang <wxy11787@foxmail.com>
Date: Wed, 22 Sep 2021 12:38:09 +0800
Subject: [PATCH] Block WPS

---
 Ink Canvas/MainWindow.xaml    | 14 ++++++++------
 Ink Canvas/MainWindow.xaml.cs | 16 +++++++++++-----
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index a419413..5eb3bb5 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -46,10 +46,10 @@
                 Width="400" HorizontalAlignment="Center"
                 Margin="100" Visibility="Visible">
             <Grid>
-                <ScrollViewer VerticalScrollBarVisibility="Auto"
+                <ScrollViewer Margin="0,60,0,0" VerticalScrollBarVisibility="Auto"
                               PanningMode="VerticalOnly" ui:ThemeManager.RequestedTheme="Light"
                               ManipulationBoundaryFeedback="SCManipulationBoundaryFeedback">
-                    <StackPanel Margin="20,70,20,20">
+                    <StackPanel Margin="20,20,20,20">
                         <TextBlock FontSize="14" Margin="0,0,0,0"
                                    Text="*设置将自动保存，再次点击“设置”按钮将关闭此页面。"/>
                         <TextBlock FontSize="14" Margin="0,0,0,12"
@@ -102,7 +102,8 @@
                                 </TextBlock>
                             </ui:SimpleStackPanel>
                         </GroupBox>
-                        <GroupBox Name="GroupBoxMASEZVersion" Visibility="Collapsed"
+                        <GroupBox Name="GroupBoxMASEZVersion"
+                                  Visibility="Collapsed"
                                   Header="马鞍山二中专版说明">
                             <ui:SimpleStackPanel Spacing="12">
                                 <TextBlock Name="TextBlockMASEZNotice" FontSize="14" Margin="0,0,0,0"/>
@@ -116,8 +117,8 @@
                         </GroupBox>
                     </StackPanel>
                 </ScrollViewer>
-                <Grid Background="White" Margin="10,0,10,0" Height="65" VerticalAlignment="Top">
-                    <Grid Margin="10,20,10,0">
+                <Grid Background="White" Margin="10,0,10,0" Height="60" VerticalAlignment="Top">
+                    <Grid Margin="10,20,10,-10">
                         <TextBlock Text="设置" FontSize="26" Margin="0,0,0,12"/>
                         <!--<Viewbox Margin="0,-55,0,0" Height="60" HorizontalAlignment="Right">
                         <StackPanel Orientation="Horizontal">
@@ -125,7 +126,8 @@
                             <Image Source="text.png" Width="200"/>
                         </StackPanel>
                     </Viewbox>-->
-                        <Viewbox Visibility="{Binding ElementName=GroupBoxMASEZVersion, Path=Visibility}" Margin="0,-58,0,0" Height="45" HorizontalAlignment="Right">
+                        <Viewbox Visibility="{Binding ElementName=GroupBoxMASEZVersion, Path=Visibility}"
+                                 Margin="0,-15,0,0" Height="45" HorizontalAlignment="Right">
                             <StackPanel Orientation="Horizontal">
                                 <Image Source="textCN.png" Width="200"/>
                                 <TextBlock Text="专版" FontSize="32" Foreground="#C30F2C" VerticalAlignment="Center"/>
diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
index fe3b367..9d65192 100644
--- a/Ink Canvas/MainWindow.xaml.cs	
+++ b/Ink Canvas/MainWindow.xaml.cs	
@@ -675,15 +675,21 @@ namespace Ink_Canvas
         {
             try
             {
+                Process[] processes = Process.GetProcessesByName("wpp");
+                if (processes.Length > 0)
+                {
+                    return;
+                }
+                //processes = Process.GetProcessesByName("wps");
+                //if (processes.Length > 0)
+                //{
+                //    return;
+                //}
+
                 pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("PowerPoint.Application");
 
                 if (pptApplication != null)
                 {
-                    if (pptApplication.Name.Contains("WPS Office"))
-                    {
-                        pptApplication = null;
-                        return;
-                    }
                     timerCheckPPT.Stop();
                     //获得演示文稿对象
                     presentation = pptApplication.ActivePresentation;