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 @@ 开发者: XY Wang (WXRIW) - 贡献者: Kengwang, Raspberry Kan, jiajiaxd, CN-Ironegg, Clover Yan, STBBRD + 贡献者: Kengwang, Raspberry Kan, jiajiaxd, CN-Ironegg, Clover Yan, STBBRD, ChangSakura 开源地址: 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))