From 5a185703887c5851615b266418ed34d0d5d3b11f Mon Sep 17 00:00:00 2001
From: clover_yan <i@cyan.ml>
Date: Wed, 7 Jun 2023 12:32:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow.xaml    |  2 +-
 Ink Canvas/MainWindow.xaml.cs | 59 ++++++++++++++++++-----------------
 2 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 211e8ae..25e2093 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -902,7 +902,7 @@
                         </Border>
                         <Border x:Name="PptNavigationBtn" Width="36" Height="36" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
                             <Grid MouseUp="PPTNavigationBtn_Click">
-                                <TextBlock Name="PptNavigationTextBlock" FontSize="10" Foreground="#FF666666" HorizontalAlignment="Center" VerticalAlignment="Center" Text="0/0" />
+                                <TextBlock Name="PptNavigationTextBlock" FontSize="10" Foreground="{DynamicResource ToolBarForeground}" HorizontalAlignment="Center" VerticalAlignment="Center" Text="0/0" />
                             </Grid>
                         </Border>
                         <Border Width="36" MouseUp="GridPPTControlNext_MouseUp" Height="36" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
index 5cdb79f..d600e9b 100644
--- a/Ink Canvas/MainWindow.xaml.cs	
+++ b/Ink Canvas/MainWindow.xaml.cs	
@@ -1458,38 +1458,38 @@ namespace Ink_Canvas
                 inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
                 CancelSingleFingerDragMode();
                 forceEraser = false;
+
+                // 改变选中提示
+                ViewboxBtnColorBlackContent.Visibility = Visibility.Collapsed;
+                ViewboxBtnColorBlueContent.Visibility = Visibility.Collapsed;
+                ViewboxBtnColorGreenContent.Visibility = Visibility.Collapsed;
+                ViewboxBtnColorRedContent.Visibility = Visibility.Collapsed;
+                ViewboxBtnColorYellowContent.Visibility = Visibility.Collapsed;
+                ViewboxBtnColorWhiteContent.Visibility = Visibility.Collapsed;
+                switch (inkColor)
+                {
+                    case 0:
+                        ViewboxBtnColorBlackContent.Visibility = Visibility.Visible;
+                        break;
+                    case 1:
+                        ViewboxBtnColorRedContent.Visibility = Visibility.Visible;
+                        break;
+                    case 2:
+                        ViewboxBtnColorGreenContent.Visibility = Visibility.Visible;
+                        break;
+                    case 3:
+                        ViewboxBtnColorBlueContent.Visibility = Visibility.Visible;
+                        break;
+                    case 4:
+                        ViewboxBtnColorYellowContent.Visibility = Visibility.Visible;
+                        break;
+                    case 5:
+                        ViewboxBtnColorWhiteContent.Visibility = Visibility.Visible;
+                        break;
+                }
             }
 
             isLongPressSelected = false;
-
-            // 改变选中提示
-            ViewboxBtnColorBlackContent.Visibility = Visibility.Collapsed;
-            ViewboxBtnColorBlueContent.Visibility = Visibility.Collapsed;
-            ViewboxBtnColorGreenContent.Visibility = Visibility.Collapsed;
-            ViewboxBtnColorRedContent.Visibility = Visibility.Collapsed;
-            ViewboxBtnColorYellowContent.Visibility = Visibility.Collapsed;
-            ViewboxBtnColorWhiteContent.Visibility = Visibility.Collapsed;
-            switch (inkColor)
-            {
-                case 0:
-                    ViewboxBtnColorBlackContent.Visibility = Visibility.Visible;
-                    break;
-                case 1:
-                    ViewboxBtnColorRedContent.Visibility = Visibility.Visible;
-                    break;
-                case 2:
-                    ViewboxBtnColorGreenContent.Visibility = Visibility.Visible;
-                    break;
-                case 3:
-                    ViewboxBtnColorBlueContent.Visibility = Visibility.Visible;
-                    break;
-                case 4:
-                    ViewboxBtnColorYellowContent.Visibility = Visibility.Visible;
-                    break;
-                case 5:
-                    ViewboxBtnColorWhiteContent.Visibility = Visibility.Visible;
-                    break;
-            }
         }
 
         private void BtnColorBlack_Click(object sender, RoutedEventArgs e)
@@ -6849,6 +6849,7 @@ namespace Ink_Canvas
         {
             BtnSelect_Click(BtnSelect, null);
 
+            ImageEraser.Visibility = Visibility.Visible;
             ViewboxBtnColorBlackContent.Visibility = Visibility.Collapsed;
             ViewboxBtnColorBlueContent.Visibility = Visibility.Collapsed;
             ViewboxBtnColorGreenContent.Visibility = Visibility.Collapsed;