Skip to content

Commit b404006

Browse files
WuChangingWXRIW
authored andcommitted
[fix] 非预期的橡皮大小;软件启动时部分设置选项未更新值
1 parent 6627e81 commit b404006

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

Ink Canvas/MainWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@
598598
<Bold>开发者:</Bold> XY Wang (WXRIW)
599599
</TextBlock>
600600
<TextBlock FontSize="14" TextWrapping="Wrap">
601-
<Bold>贡献者:</Bold> Kengwang, Raspberry Kan, jiajiaxd, CN-Ironegg, Clover Yan, STBBRD
601+
<Bold>贡献者:</Bold> Kengwang, Raspberry Kan, jiajiaxd, CN-Ironegg, Clover Yan, STBBRD, ChangSakura
602602
</TextBlock>
603603
<TextBlock FontSize="14">
604604
<Bold>开源地址:</Bold>

Ink Canvas/MainWindow.xaml.cs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -702,6 +702,14 @@ private void LoadSettings(bool isStartup = true)
702702
{
703703
ToggleSwitchEnableTwoFingerZoom.IsOn = false;
704704
}
705+
if (Settings.Gesture.IsEnableTwoFingerTranslate)
706+
{
707+
ToggleSwitchEnableTwoFingerTranslate.IsOn = true;
708+
}
709+
else
710+
{
711+
ToggleSwitchEnableTwoFingerTranslate.IsOn = false;
712+
}
705713
if (Settings.Gesture.IsEnableTwoFingerRotation)
706714
{
707715
ToggleSwitchEnableTwoFingerRotation.IsOn = true;
@@ -761,6 +769,8 @@ private void LoadSettings(bool isStartup = true)
761769
ComboBoxPenStyle.SelectedIndex = Settings.Canvas.InkStyle;
762770

763771
ComboBoxEraserSize.SelectedIndex = Settings.Canvas.EraserSize;
772+
773+
ComboBoxHyperbolaAsymptoteOption.SelectedIndex = (int)Settings.Canvas.HyperbolaAsymptoteOption;
764774
}
765775
else
766776
{
@@ -1045,9 +1055,9 @@ private void BtnErase_Click(object sender, RoutedEventArgs e)
10451055
forcePointEraser = false;
10461056
break;
10471057
}
1058+
inkCanvas.EraserShape = forcePointEraser ? new EllipseStylusShape(50, 50) : new EllipseStylusShape(5, 5);
10481059
inkCanvas.EditingMode =
10491060
forcePointEraser ? InkCanvasEditingMode.EraseByPoint : InkCanvasEditingMode.EraseByStroke;
1050-
inkCanvas.EraserShape = forcePointEraser ? new EllipseStylusShape(50, 50) : new EllipseStylusShape(5, 5);
10511061
drawingShapeMode = 0;
10521062
GeometryDrawingEraser.Brush = forcePointEraser
10531063
? new SolidColorBrush(Color.FromRgb(0x23, 0xA9, 0xF2))

0 commit comments

Comments
 (0)