Fix #20
This commit is contained in:
parent
812be52dd7
commit
348b3d92cc
@ -357,6 +357,7 @@
|
||||
</GroupBox>
|
||||
<GroupBox Header="手势">
|
||||
<ui:SimpleStackPanel Spacing="12">
|
||||
<ui:ToggleSwitch Name="ToggleSwitchEnableTwoFingerZoom" Header="允许双指缩放" FontFamily="Microsoft YaHei UI" IsOn="True" OnContent="开" OffContent="关" Toggled="ToggleSwitchEnableTwoFingerZoom_Toggled"/>
|
||||
<ui:ToggleSwitch Name="ToggleSwitchEnableTwoFingerRotation" Header="允许双指旋转" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchEnableTwoFingerRotation_Toggled"/>
|
||||
<TextBlock Text="允许选中墨迹后对墨迹进行双指或多指缩放操作(此设置不受“允许双指旋转”设置的影响)" TextWrapping="Wrap" Foreground="#666666"/>
|
||||
<ui:ToggleSwitch Name="ToggleSwitchEnableTwoFingerRotationOnSelection" Header="允许双指旋转选中的墨迹" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchEnableTwoFingerRotation_Toggled"/>
|
||||
|
@ -546,6 +546,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;
|
||||
@ -1540,6 +1548,8 @@ namespace Ink_Canvas
|
||||
InkCanvasEditingMode lastInkCanvasEditingMode = InkCanvasEditingMode.Ink;
|
||||
bool isSingleFingerDragMode = false;
|
||||
|
||||
//防止衣服误触造成的墨迹消失
|
||||
|
||||
private void inkCanvas_PreviewTouchDown(object sender, TouchEventArgs e)
|
||||
{
|
||||
dec.Add(e.TouchDevice.Id);
|
||||
@ -1553,9 +1563,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;
|
||||
@ -1618,7 +1628,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;
|
||||
@ -2556,6 +2566,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;
|
||||
|
@ -12,7 +12,7 @@ using System.Windows;
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("WXRIW")]
|
||||
[assembly: AssemblyProduct("Ink Canvas")]
|
||||
[assembly: AssemblyCopyright("Copyright © XY Wang 2021")]
|
||||
[assembly: AssemblyCopyright("Copyright © XY Wang 2022")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
@ -51,5 +51,5 @@ using System.Windows;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("3.2.3.0")]
|
||||
[assembly: AssemblyFileVersion("3.2.3.0")]
|
||||
[assembly: AssemblyVersion("3.2.4.0")]
|
||||
[assembly: AssemblyFileVersion("3.2.4.0")]
|
||||
|
@ -49,6 +49,8 @@ namespace Ink_Canvas
|
||||
|
||||
public class Gesture
|
||||
{
|
||||
[JsonProperty("isEnableTwoFingerZoom")]
|
||||
public bool IsEnableTwoFingerZoom { get; set; } = true;
|
||||
[JsonProperty("isEnableTwoFingerRotation")]
|
||||
public bool IsEnableTwoFingerRotation { get; set; } = false;
|
||||
[JsonProperty("isEnableTwoFingerRotationOnSelection")]
|
||||
|
Loading…
Reference in New Issue
Block a user