diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 7eddf84..9b0b6cb 100644
--- a/Ink Canvas/MainWindow.xaml
+++ b/Ink Canvas/MainWindow.xaml
@@ -504,11 +504,11 @@
-
+
-
+
@@ -529,16 +529,7 @@
FontSize="14" Width="30" HorizontalAlignment="Center"
Visibility="{Binding Path=Visibility, ElementName=TouchMultiplierSlider, Mode=OneWay}"/>
-
-
-
-
-
-
-
-
-
@@ -589,7 +580,7 @@
- 当前版本:
+ 当前版本:
@@ -949,7 +940,7 @@
-
+
@@ -959,7 +950,7 @@
-
+
diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
index 79ca7fe..27cf61e 100644
--- a/Ink Canvas/MainWindow.xaml.cs
+++ b/Ink Canvas/MainWindow.xaml.cs
@@ -962,8 +962,6 @@ namespace Ink_Canvas
ToggleSwitchIsSpecialScreen.IsOn = false;
}
TouchMultiplierSlider.Visibility = ToggleSwitchIsSpecialScreen.IsOn ? Visibility.Visible : Visibility.Collapsed;
-
- ToggleSwitchIsQuadIR.IsOn = Settings.Advanced.IsQuadIR;
}
else
{
@@ -1821,12 +1819,10 @@ namespace Ink_Canvas
}
else
{
- //inkCanvas.EraserShape = new RectangleStylusShape(8, 8); //old old
- //inkCanvas.EraserShape = forcePointEraser ? new EllipseStylusShape(50, 50) : new EllipseStylusShape(5, 5); //last
- //inkCanvas.EraserShape = new EllipseStylusShape(boundsWidth * 1.5, boundsWidth * 1.5); //old old
- //inkCanvas.EditingMode = forcePointEraser ? InkCanvasEditingMode.EraseByPoint : InkCanvasEditingMode.EraseByStroke; //last
- inkCanvas.EraserShape = new EllipseStylusShape(5, 5);
- inkCanvas.EditingMode = InkCanvasEditingMode.EraseByStroke;
+ inkCanvas.EraserShape = forcePointEraser ? new EllipseStylusShape(50, 50) : new EllipseStylusShape(5, 5);
+ //inkCanvas.EraserShape = new RectangleStylusShape(8, 8);
+ //inkCanvas.EraserShape = new EllipseStylusShape(boundsWidth * 1.5, boundsWidth * 1.5);
+ inkCanvas.EditingMode = forcePointEraser ? InkCanvasEditingMode.EraseByPoint : InkCanvasEditingMode.EraseByStroke;
}
}
}
@@ -1842,9 +1838,7 @@ namespace Ink_Canvas
public double GetTouchBoundWidth(TouchEventArgs e)
{
var args = e.GetTouchPoint(null).Bounds;
- double value;
- if (!Settings.Advanced.IsQuadIR) value = args.Width;
- else value = Math.Sqrt(args.Width * args.Height); //四边红外
+ double value = args.Width;
if (Settings.Advanced.IsSpecialScreen) value *= Settings.Advanced.TouchMultiplier;
return value;
}
@@ -3166,16 +3160,6 @@ namespace Ink_Canvas
SaveSettingsToFile();
}
- private void BorderCalculateMultiplier_TouchDown(object sender, TouchEventArgs e)
- {
- var args = e.GetTouchPoint(null).Bounds;
- double value;
- if (!Settings.Advanced.IsQuadIR) value = args.Width;
- else value = Math.Sqrt(args.Width * args.Height); //四边红外
-
- TextBlockShowCalculatedMultiplier.Text = (5 / (value * 1.1)).ToString();
- }
-
private void ToggleSwitchEraserBindTouchMultiplier_Toggled(object sender, RoutedEventArgs e)
{
if (!isLoaded) return;
@@ -3183,13 +3167,6 @@ namespace Ink_Canvas
SaveSettingsToFile();
}
- private void ToggleSwitchIsQuadIR_Toggled(object sender, RoutedEventArgs e)
- {
- if (!isLoaded) return;
- Settings.Advanced.IsQuadIR = ToggleSwitchIsQuadIR.IsOn;
- SaveSettingsToFile();
- }
-
private void ToggleSwitchIsLogEnabled_Toggled(object sender, RoutedEventArgs e)
{
if (!isLoaded) return;
@@ -6930,7 +6907,7 @@ namespace Ink_Canvas
{
//进入黑板
Topmost = false;
-
+
if (BtnPPTSlideShowEnd.Visibility == Visibility.Collapsed)
{
pointDesktop = new Point(ViewboxFloatingBar.Margin.Left, ViewboxFloatingBar.Margin.Top);
diff --git a/Ink Canvas/Settings.cs b/Ink Canvas/Settings.cs
index 6305b8c..71a2056 100644
--- a/Ink Canvas/Settings.cs
+++ b/Ink Canvas/Settings.cs
@@ -145,12 +145,10 @@ namespace Ink_Canvas
{
[JsonProperty("isSpecialScreen")]
public bool IsSpecialScreen { get; set; } = false;
- [JsonProperty("isQuadIR")]
- public bool IsQuadIR { get; set; } = false;
[JsonProperty("touchMultiplier")]
public double TouchMultiplier { get; set; } = 0.25;
[JsonProperty("eraserBindTouchMultiplier")]
- public bool EraserBindTouchMultiplier { get; set; } = true;
+ public bool EraserBindTouchMultiplier { get; set; } = false;
[JsonProperty("isLogEnabled")]
public bool IsLogEnabled { get; set; } = true;
}