kriastans/InkCanvasForClass
kriastans/InkCanvasForClass
1
Fork 0
Code Issues 1 Actions Projects 1 Releases Wiki Activity

Fix #24

Browse Source
This commit is contained in:
XY Wang 2022-07-18 18:44:51 +08:00
parent 836892f339
commit 36fc55763d
2 changed files with 1084 additions and 1086 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2130
Ink Canvas/MainWindow.xaml
View File

File diff suppressed because it is too large Load Diff

40
Ink Canvas/MainWindow.xaml.cs
View File

@ -239,20 +239,7 @@ namespace Ink_Canvas
private void KeyExit(object sender, ExecutedRoutedEventArgs e)
{
//if (isInkCanvasVisible)
//{
// Main_Grid.Visibility = Visibility.Hidden;
// isInkCanvasVisible = false;
// //inkCanvas.Strokes.Clear();
// WindowState = WindowState.Minimized;
//}
//else
//{
// Main_Grid.Visibility = Visibility.Visible;
// isInkCanvasVisible = true;
// inkCanvas.Strokes.Clear();
// WindowState = WindowState.Maximized;
//}
BtnPPTSlideShowEnd_Click(BtnPPTSlideShowEnd, null);
}
#endregion Hotkeys
@ -549,6 +536,14 @@ namespace Ink_Canvas
{
Settings.Gesture = new Gesture();
}
if (Settings.Gesture.IsEnableTwoFingerZoom)
{
ToggleSwitchEnableTwoFingerZoom.IsOn = true;
}
else
{
ToggleSwitchEnableTwoFingerZoom.IsOn = false;
}
if (Settings.Gesture.IsEnableTwoFingerRotation)
{
ToggleSwitchEnableTwoFingerRotation.IsOn = true;
@ -1543,6 +1538,8 @@ namespace Ink_Canvas
InkCanvasEditingMode lastInkCanvasEditingMode = InkCanvasEditingMode.Ink;
bool isSingleFingerDragMode = false;
//防止衣服误触造成的墨迹消失
private void inkCanvas_PreviewTouchDown(object sender, TouchEventArgs e)
{
dec.Add(e.TouchDevice.Id);
@ -1556,9 +1553,9 @@ namespace Ink_Canvas
lastTouchDownStrokeCollection = inkCanvas.Strokes.Clone();
}
//设备两个及两个以上，将画笔功能关闭
if (dec.Count > 1 || isSingleFingerDragMode)
if (dec.Count > 1 || isSingleFingerDragMode || !Settings.Gesture.IsEnableTwoFingerZoom)
{
if (isInMultiTouchMode) return;
if (isInMultiTouchMode || !Settings.Gesture.IsEnableTwoFingerZoom) return;
if (inkCanvas.EditingMode != InkCanvasEditingMode.None && inkCanvas.EditingMode != InkCanvasEditingMode.Select)
{
lastInkCanvasEditingMode = inkCanvas.EditingMode;
@ -1621,7 +1618,7 @@ namespace Ink_Canvas
private void Main_Grid_ManipulationDelta(object sender, ManipulationDeltaEventArgs e)
{
if (isInMultiTouchMode) return;
if (isInMultiTouchMode || !Settings.Gesture.IsEnableTwoFingerZoom) return;
if ((dec.Count >= 2 && (Settings.Gesture.IsEnableTwoFingerGestureInPresentationMode || StackPanelPPTControls.Visibility != Visibility.Visible || StackPanelPPTButtons.Visibility == Visibility.Collapsed)) || isSingleFingerDragMode)
{
ManipulationDelta md = e.DeltaManipulation;
@ -2559,6 +2556,15 @@ namespace Ink_Canvas
SaveSettingsToFile();
}
private void ToggleSwitchEnableTwoFingerZoom_Toggled(object sender, RoutedEventArgs e)
{
if (!isLoaded) return;
Settings.Gesture.IsEnableTwoFingerZoom = ToggleSwitchEnableTwoFingerZoom.IsOn;
SaveSettingsToFile();
}
private void ToggleSwitchEnableTwoFingerRotation_Toggled(object sender, RoutedEventArgs e)
{
if (!isLoaded) return;