[fix] lastDesktopInkColor

ChangSakura · May 13, 2024 · 8b54e79 · 8b54e79
1 parent 1961309
commit 8b54e79
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/AutomaticUpdateVersionControl.txt b/AutomaticUpdateVersionControl.txt
@@ -1 +1 @@
-4.7.1
+4.7.2
diff --git a/Ink Canvas/MainWindow_cs/MW_FloatBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatBarIcons.cs
@@ -260,6 +260,7 @@ private void ImageBlackboard_MouseUp(object sender, MouseButtonEventArgs e) {
             if (inkCanvas.EditingMode == InkCanvasEditingMode.Select) PenIcon_Click(null, null);
 
             if (currentMode == 0) {
+                currentMode = 1;
                 //进入画板
                 PPTNavigationBottomLeft.Visibility = Visibility.Collapsed;
                 PPTNavigationBottomRight.Visibility = Visibility.Collapsed;
@@ -281,10 +282,8 @@ private void ImageBlackboard_MouseUp(object sender, MouseButtonEventArgs e) {
                     });
                 })).Start();
 
-                if (Settings.Canvas.UsingWhiteboard) {
-                    BtnColorBlack_Click(null, null);
-                } else {
-                    BtnColorWhite_Click(null, null);
+                if (Pen_Icon.Background == null) {
+                    PenIcon_Click(BoardPenIcon, null);
                 }
 
                 if (Settings.Gesture.AutoSwitchTwoFingerGesture) // 自动关闭多指书写、开启双指移动
@@ -293,6 +292,7 @@ private void ImageBlackboard_MouseUp(object sender, MouseButtonEventArgs e) {
                     if (isInMultiTouchMode) ToggleSwitchEnableMultiTouchMode.IsOn = false;
                 }
             } else {
+                currentMode = 0;
                 //退出画板
                 HideSubPanelsImmediately();
 
@@ -1030,8 +1030,7 @@ private void BtnHideControl_Click(object sender, RoutedEventArgs e) {
 
         private void BtnSwitch_Click(object sender, RoutedEventArgs e) {
             if (Main_Grid.Background == Brushes.Transparent) {
-                if (currentMode == 0) {
-                    currentMode++;
+                if (currentMode == 1) {
                     GridBackgroundCover.Visibility = Visibility.Collapsed;
                     AnimationsHelper.HideWithSlideAndFade(BlackboardLeftSide);
                     AnimationsHelper.HideWithSlideAndFade(BlackboardCenterSide);
@@ -1061,7 +1060,7 @@ private void BtnSwitch_Click(object sender, RoutedEventArgs e) {
                 Topmost = true;
                 BtnHideInkCanvas_Click(BtnHideInkCanvas, e);
             } else {
-                switch ((++currentMode) % 2) {
+                switch (currentMode) {
                     case 0: //屏幕模式
                         currentMode = 0;
                         GridBackgroundCover.Visibility = Visibility.Collapsed;

diff --git a/Ink Canvas/MainWindow_cs/MW_PenColors.cs b/Ink Canvas/MainWindow_cs/MW_PenColors.cs
@@ -1,5 +1,6 @@
 using Ink_Canvas.Helpers;
 using System;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Ink;
@@ -301,8 +302,11 @@ private void CheckColorTheme(bool changeColorTheme = false) {
         }
 
         private void CheckLastColor(int inkColor) {
-            if (currentMode == 0) lastDesktopInkColor = inkColor;
-            else lastBoardInkColor = inkColor;
+            if (currentMode == 0) {
+                lastDesktopInkColor = inkColor;
+            } else {
+                lastBoardInkColor = inkColor;
+            }
         }
 
         private void BtnColorBlack_Click(object sender, RoutedEventArgs e) {

diff --git a/Ink Canvas/Properties/AssemblyInfo.cs b/Ink Canvas/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.7.1.0")]
-[assembly: AssemblyFileVersion("4.7.1.0")]
+[assembly: AssemblyVersion("4.7.2.0")]
+[assembly: AssemblyFileVersion("4.7.2.0")]