From 99c29e930a0860adf6c8c2527fe860563a4ef532 Mon Sep 17 00:00:00 2001
From: ChangSakura <ChangSakura@outlook.com>
Date: Sun, 3 Dec 2023 01:21:46 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E9=9D=9E=E9=A2=84=E6=9C=9F=E7=9A=84?=
 =?UTF-8?q?=E6=A9=A1=E7=9A=AE=E5=A4=A7=E5=B0=8F=EF=BC=9B=E8=BD=AF=E4=BB=B6?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=97=B6=E9=83=A8=E5=88=86=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E6=9C=AA=E6=9B=B4=E6=96=B0=E5=80=BC?=
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 | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 5729d3f7..95f7ffc9 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -598,7 +598,7 @@
                                      <Bold>开发者:</Bold> XY Wang (WXRIW)
                                 </TextBlock>
                                 <TextBlock FontSize="14" TextWrapping="Wrap">
-                                     <Bold>贡献者:</Bold> Kengwang, Raspberry Kan, jiajiaxd, CN-Ironegg, Clover Yan, STBBRD
+                                     <Bold>贡献者:</Bold> Kengwang, Raspberry Kan, jiajiaxd, CN-Ironegg, Clover Yan, STBBRD, ChangSakura
                                 </TextBlock>
                                 <TextBlock FontSize="14">
                                     <Bold>开源地址:</Bold>
diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
index ba01a3ac..a84f4a99 100644
--- a/Ink Canvas/MainWindow.xaml.cs	
+++ b/Ink Canvas/MainWindow.xaml.cs	
@@ -702,6 +702,14 @@ private void LoadSettings(bool isStartup = true)
             {
                 ToggleSwitchEnableTwoFingerZoom.IsOn = false;
             }
+            if (Settings.Gesture.IsEnableTwoFingerTranslate)
+            {
+                ToggleSwitchEnableTwoFingerTranslate.IsOn = true;
+            }
+            else
+            {
+                ToggleSwitchEnableTwoFingerTranslate.IsOn = false;
+            }
             if (Settings.Gesture.IsEnableTwoFingerRotation)
             {
                 ToggleSwitchEnableTwoFingerRotation.IsOn = true;
@@ -761,6 +769,8 @@ private void LoadSettings(bool isStartup = true)
                 ComboBoxPenStyle.SelectedIndex = Settings.Canvas.InkStyle;
 
                 ComboBoxEraserSize.SelectedIndex = Settings.Canvas.EraserSize;
+
+                ComboBoxHyperbolaAsymptoteOption.SelectedIndex = (int)Settings.Canvas.HyperbolaAsymptoteOption;
             }
             else
             {
@@ -1045,9 +1055,9 @@ private void BtnErase_Click(object sender, RoutedEventArgs e)
                     forcePointEraser = false;
                     break;
             }
+            inkCanvas.EraserShape = forcePointEraser ? new EllipseStylusShape(50, 50) : new EllipseStylusShape(5, 5);
             inkCanvas.EditingMode =
                 forcePointEraser ? InkCanvasEditingMode.EraseByPoint : InkCanvasEditingMode.EraseByStroke;
-            inkCanvas.EraserShape = forcePointEraser ? new EllipseStylusShape(50, 50) : new EllipseStylusShape(5, 5);
             drawingShapeMode = 0;
             GeometryDrawingEraser.Brush = forcePointEraser
                 ? new SolidColorBrush(Color.FromRgb(0x23, 0xA9, 0xF2))