[update] 形状绘制修复
This commit is contained in:
parent
a11a8e3ecf
commit
301deea0f9
@ -53,7 +53,7 @@ namespace Ink_Canvas
|
||||
bool ret;
|
||||
mutex = new System.Threading.Mutex(true, "InkCanvasForClass", out ret);
|
||||
|
||||
if (!ret && !e.Args.Contains("-m")) //-m multiple
|
||||
if (!ret && !(e.Args.Contains("-m")||e.Args.Contains("--multiple"))) //-m multiple
|
||||
{
|
||||
LogHelper.NewLog("Detected existing instance");
|
||||
|
||||
|
||||
@ -6321,33 +6321,31 @@
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
<TextBlock Foreground="#fafafa" Text="滑动鼠标滚轮缩放画布"
|
||||
<TextBlock Foreground="#fafafa" Text="滑动鼠标滚轮"
|
||||
VerticalAlignment="Center" FontSize="14" Margin="0,0,6,0" />
|
||||
<Border Height="20" CornerRadius="3" Background="#1e3a8a" Margin="0,0,12,0"
|
||||
Padding="4,0">
|
||||
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="3"
|
||||
VerticalAlignment="Center">
|
||||
<Image Width="16" Height="16" VerticalAlignment="Center">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||
<GeometryDrawing Brush="#dbeafe"
|
||||
Geometry="F0 M24,24z M0,0z M18.75,4C18.75,3.58579 18.4142,3.25 18,3.25 17.5858,3.25 17.25,3.58579 17.25,4 17.25,4.33152 17.1183,4.64946 16.8839,4.88388 16.6495,5.1183 16.3315,5.25 16,5.25 15.5858,5.25 15.25,5.58579 15.25,6 15.25,6.41421 15.5858,6.75 16,6.75 16.3315,6.75 16.6495,6.8817 16.8839,7.11612 17.1183,7.35054 17.25,7.66848 17.25,8 17.25,8.41421 17.5858,8.75 18,8.75 18.4142,8.75 18.75,8.41421 18.75,8 18.75,7.66848 18.8817,7.35054 19.1161,7.11612 19.3505,6.8817 19.6685,6.75 20,6.75 20.4142,6.75 20.75,6.41421 20.75,6 20.75,5.58579 20.4142,5.25 20,5.25 19.6685,5.25 19.3505,5.1183 19.1161,4.88388 18.8817,4.64946 18.75,4.33152 18.75,4z M9.75,6C9.75,5.58579 9.41421,5.25 9,5.25 8.58579,5.25 8.25,5.58579 8.25,6 8.25,7.39239 7.69688,8.72774 6.71231,9.71231 5.72774,10.6969 4.39239,11.25 3,11.25 2.58579,11.25 2.25,11.5858 2.25,12 2.25,12.4142 2.58579,12.75 3,12.75 4.39239,12.75 5.72774,13.3031 6.71231,14.2877 7.69688,15.2723 8.25,16.6076 8.25,18 8.25,18.4142 8.58579,18.75 9,18.75 9.41421,18.75 9.75,18.4142 9.75,18 9.75,16.6076 10.3031,15.2723 11.2877,14.2877 12.2723,13.3031 13.6076,12.75 15,12.75 15.4142,12.75 15.75,12.4142 15.75,12 15.75,11.5858 15.4142,11.25 15,11.25 13.6076,11.25 12.2723,10.6969 11.2877,9.71231 10.3031,8.72774 9.75,7.39239 9.75,6z M18.75,16C18.75,15.5858 18.4142,15.25 18,15.25 17.5858,15.25 17.25,15.5858 17.25,16 17.25,16.3315 17.1183,16.6495 16.8839,16.8839 16.6495,17.1183 16.3315,17.25 16,17.25 15.5858,17.25 15.25,17.5858 15.25,18 15.25,18.4142 15.5858,18.75 16,18.75 16.3315,18.75 16.6495,18.8817 16.8839,19.1161 17.1183,19.3505 17.25,19.6685 17.25,20 17.25,20.4142 17.5858,20.75 18,20.75 18.4142,20.75 18.75,20.4142 18.75,20 18.75,19.6685 18.8817,19.3505 19.1161,19.1161 19.3505,18.8817 19.6685,18.75 20,18.75 20.4142,18.75 20.75,18.4142 20.75,18 20.75,17.5858 20.4142,17.25 20,17.25 19.6685,17.25 19.3505,17.1183 19.1161,16.8839 18.8817,16.6495 18.75,16.3315 18.75,16z" />
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
<TextBlock Foreground="#dbeafe" Text="新功能" FontSize="12"
|
||||
VerticalAlignment="Center" />
|
||||
</ui:SimpleStackPanel>
|
||||
</Border>
|
||||
<ComboBox Name="ComboBoxMouseWheelAction"
|
||||
FontFamily="Microsoft YaHei UI"
|
||||
SelectedIndex="0" Margin="0,0,16,0"
|
||||
SelectionChanged="ComboBoxDefaultMultiPointHandWriting_SelectionChanged">
|
||||
<ComboBoxItem Content="缩放画布" FontFamily="Microsoft YaHei UI" />
|
||||
<ComboBoxItem Content="调整笔粗细" FontFamily="Microsoft YaHei UI" />
|
||||
</ComboBox>
|
||||
<ui:ToggleSwitch OnContent="" OffContent=""
|
||||
Name="ToggleSwitchEnableMouseWheelGesture" IsOn="True"
|
||||
FontFamily="Microsoft YaHei UI" FontWeight="Bold"
|
||||
Toggled="ToggleSwitchEnableMouseWheelGesture_Toggled" />
|
||||
</ui:SimpleStackPanel>
|
||||
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||
<TextBlock Foreground="#fafafa" Text="鼠标滚轮正方向" VerticalAlignment="Center"
|
||||
FontSize="14" Margin="0,0,16,0" />
|
||||
<ComboBox Name="ComboBoxMousewheelForwardDirection"
|
||||
FontFamily="Microsoft YaHei UI"
|
||||
SelectedIndex="0"
|
||||
SelectionChanged="ComboBoxDefaultMultiPointHandWriting_SelectionChanged">
|
||||
<ComboBoxItem Content="滚轮向上" FontFamily="Microsoft YaHei UI" />
|
||||
<ComboBoxItem Content="滚轮向下" FontFamily="Microsoft YaHei UI" />
|
||||
</ComboBox>
|
||||
</ui:SimpleStackPanel>
|
||||
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46"
|
||||
StrokeThickness="1" Margin="0,4,0,4" />
|
||||
<TextBlock Margin="0,0,0,8" Text="Windows Ink 支持" FontWeight="Bold" Foreground="#fafafa"
|
||||
@ -6472,6 +6470,13 @@
|
||||
FontWeight="Bold"
|
||||
Toggled="ToggleSwitchEnableInkToShapeNoFakePressureTriangle_Toggled" />
|
||||
</ui:SimpleStackPanel>
|
||||
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||
<TextBlock Foreground="#fafafa" Text="将识别的墨迹当作形状处理" VerticalAlignment="Center"
|
||||
FontSize="14" Margin="0,0,16,0" />
|
||||
<ui:ToggleSwitch OnContent="" OffContent="" Name="ToggleSwitchEnableInkAsShape"
|
||||
IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
|
||||
Toggled="ToggleSwitchEnableInkToShape_Toggled" />
|
||||
</ui:SimpleStackPanel>
|
||||
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0"
|
||||
Stroke="#3f3f46" StrokeThickness="1" Margin="0,4,0,4" />
|
||||
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||
@ -7025,8 +7030,36 @@
|
||||
FontFamily="Microsoft YaHei UI" FontWeight="Bold"
|
||||
Toggled="ToggleSwitchRegistryShowBlackScreenLastSlideShow_Toggled" />
|
||||
</ui:SimpleStackPanel>
|
||||
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||
<TextBlock Foreground="#fafafa" Text="PPT强制禁用两侧工具按钮"
|
||||
VerticalAlignment="Center" FontSize="14" Margin="0,0,6,0" />
|
||||
<Border Height="20" CornerRadius="3" Background="#854d0e" Margin="0,0,12,0"
|
||||
Padding="4,0">
|
||||
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="3"
|
||||
VerticalAlignment="Center">
|
||||
<Image Width="15" Height="15" VerticalAlignment="Center">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||
<GeometryDrawing Brush="#fef9c3" Geometry="F1 M24,24z M0,0z M11.0128,12.0001L11.0128,21.7541C8.82443,21.0462 6.86303,19.7703 5.32881,18.0567 3.79459,16.3431 2.74247,14.2532 2.27982,12.0001L11.0138,12.0001 11.0128,12.0001z M20.2968,15.7941C18.6969,18.6172,16.0991,20.7399,13.0138,21.7451L13.0128,12.0001 21.7208,12.0001C21.448,13.3316,20.9675,14.6119,20.2968,15.7941z M11.0138,2.52612L11.0128,10.0001 2.02682,10.0001C1.95882,8.56812 2.12782,7.12012 2.54082,5.71812 2.60393,5.50338 2.73726,5.31601 2.91947,5.18602 3.10167,5.05603 3.32223,4.99092 3.54582,5.00112 6.13403,5.11958 8.68099,4.32065 10.7378,2.74512L11.0138,2.52612z M13.0128,10.0001L13.0128,2.54712 12.9228,2.47412C14.9401,4.14969,17.4897,5.04942,20.1118,5.01112L20.4538,5.00112C20.6774,4.99092 20.898,5.05603 21.0802,5.18602 21.2624,5.31601 21.3957,5.50338 21.4588,5.71812 21.8718,7.12112 22.0408,8.56812 21.9728,10.0001L13.0128,10.0001z" />
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
<TextBlock Foreground="#fef9c3" Text="管理员" FontSize="12"
|
||||
VerticalAlignment="Center">
|
||||
</TextBlock>
|
||||
</ui:SimpleStackPanel>
|
||||
</Border>
|
||||
<ui:ToggleSwitch OnContent="" OffContent=""
|
||||
Name="ToggleSwitchRegistryDisableSlideShowSideToolButton" IsOn="True"
|
||||
FontFamily="Microsoft YaHei UI" FontWeight="Bold"
|
||||
Toggled="ToggleSwitchRegistryShowBlackScreenLastSlideShow_Toggled" />
|
||||
</ui:SimpleStackPanel>
|
||||
<TextBlock
|
||||
Text="# 以上功能会修改注册表，需要管理员权限运行。操作前请先备份注册表。选项仅支持最新Office 365和WPS，其他版本未经测试。"
|
||||
Text="# 以上功能会修改注册表，需要管理员权限运行。操作前请先备份注册表。选项仅支持最新Office 365，其他版本未经测试。"
|
||||
TextWrapping="Wrap" Foreground="#a1a1aa" />
|
||||
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46"
|
||||
StrokeThickness="1" Margin="0,4,0,4" />
|
||||
@ -8184,11 +8217,6 @@
|
||||
IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
|
||||
Toggled="ToggleSwitchAutoKillSeewoLauncher2DesktopAnnotation_Toggled" />
|
||||
</ui:SimpleStackPanel>
|
||||
<TextBlock TextWrapping="Wrap" Foreground="#a1a1aa" Visibility="Collapsed">
|
||||
<Run Text="# 由于希沃桌面2.0提供的桌面批注是64位应用程序，icc是32位程序无法访问，所以目前暂不做精准匹配，只匹配进程名称" />
|
||||
<Run FontFamily="Consolas">DesktopAnnotation</Run>
|
||||
<Run Text="，后面会考虑封装一套基于P/Invoke和WMI的综合进程识别方案。如果遇到同进程名的软件直接不开启该选项就行了，见谅！" />
|
||||
</TextBlock>
|
||||
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46"
|
||||
StrokeThickness="1" Margin="0,4,0,4" />
|
||||
<TextBlock Margin="0,0,0,8" Text="同类软件查杀" FontWeight="Bold" Foreground="#fafafa"
|
||||
@ -8217,6 +8245,13 @@
|
||||
IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
|
||||
Toggled="ToggleSwitchAutoKillICA_Toggled" />
|
||||
</ui:SimpleStackPanel>
|
||||
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46"
|
||||
StrokeThickness="1" Margin="0,4,0,4" />
|
||||
<TextBlock Margin="0,0,0,8" Text="批注弹窗拦截" FontWeight="Bold" Foreground="#fafafa"
|
||||
FontSize="20" />
|
||||
<TextBlock
|
||||
Text="# 该功能可以自动隐藏其他白板软件在最小化时显示的桌面批注弹窗，并且可以使用icc无缝替代这些弹窗。希沃系列的悬浮窗拦截后可显示 “返回到希沃软件” 按钮。"
|
||||
TextWrapping="Wrap" Foreground="#a1a1aa" />
|
||||
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46"
|
||||
StrokeThickness="1" Margin="0,4,0,4" />
|
||||
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||
@ -8774,8 +8809,19 @@
|
||||
</Canvas>
|
||||
</GroupBox.Header>
|
||||
<ui:SimpleStackPanel Spacing="6">
|
||||
<TextBlock Text="# 随机点名名单存放在 ICC 存储位置下的 LuckyRandom 目录下。支持多名单加载和切换，文件格式为txt，文件名必须以 .luckyrand.list.txt 结尾，否则不会识别！"
|
||||
TextWrapping="Wrap" Foreground="#a1a1aa" />
|
||||
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||
<TextBlock Foreground="#fafafa" Text="显示修改随机点名名单的按钮"
|
||||
<TextBlock Foreground="#fafafa" Text="为 ICC 启用机器学习以提升渲染性能"
|
||||
VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0" />
|
||||
<ui:ToggleSwitch OnContent="" OffContent=""
|
||||
Name="ToggleSwitchRandWindowSpecialConfig"
|
||||
IsOn="True" FontFamily="Microsoft YaHei UI"
|
||||
FontWeight="Bold"
|
||||
Toggled="ToggleSwitchDisplayRandWindowNamesInputBtn_OnToggled" />
|
||||
</ui:SimpleStackPanel>
|
||||
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||
<TextBlock Foreground="#fafafa" Text="显示切换随机点名名单的按钮"
|
||||
VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0" />
|
||||
<ui:ToggleSwitch OnContent="" OffContent=""
|
||||
Name="ToggleSwitchDisplayRandWindowNamesInputBtn"
|
||||
@ -8783,6 +8829,15 @@
|
||||
FontWeight="Bold"
|
||||
Toggled="ToggleSwitchDisplayRandWindowNamesInputBtn_OnToggled" />
|
||||
</ui:SimpleStackPanel>
|
||||
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||
<TextBlock Foreground="#fafafa" Text="显示点名历史记录"
|
||||
VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0" />
|
||||
<ui:ToggleSwitch OnContent="" OffContent=""
|
||||
Name="ToggleSwitchDisplayRandWindowHistory"
|
||||
IsOn="True" FontFamily="Microsoft YaHei UI"
|
||||
FontWeight="Bold"
|
||||
Toggled="ToggleSwitchDisplayRandWindowNamesInputBtn_OnToggled" />
|
||||
</ui:SimpleStackPanel>
|
||||
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0"
|
||||
Stroke="#3f3f46" StrokeThickness="1" Margin="0,4,0,4" />
|
||||
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||
|
||||
@ -17,13 +17,6 @@ namespace Ink_Canvas {
|
||||
public IccStroke(StylusPointCollection stylusPoints, DrawingAttributes drawingAttributes)
|
||||
: base(stylusPoints, drawingAttributes) { }
|
||||
|
||||
public IccStroke(StylusPointCollection stylusPoints, DrawingAttributes drawingAttributes, IccInkCanvas hostElement)
|
||||
: base(stylusPoints, drawingAttributes) {
|
||||
if (hostElement != null) _hostInkCanvas = hostElement;
|
||||
}
|
||||
|
||||
public IccInkCanvas _hostInkCanvas = null;
|
||||
|
||||
public static Guid StrokeShapeTypeGuid = new Guid("6537b29c-557f-487f-800b-cb30a8f1de78");
|
||||
public static Guid StrokeIsShapeGuid = new Guid("40eff5db-9346-4e42-bd46-7b0eb19d0018");
|
||||
|
||||
@ -47,17 +40,9 @@ namespace Ink_Canvas {
|
||||
/// </summary>
|
||||
public bool IsErasedStrokePart = false;
|
||||
|
||||
/// <summary>
|
||||
/// 指示当墨迹在屏幕外部时，是否停止渲染
|
||||
/// </summary>
|
||||
public bool IsStopOffScreenRender = true;
|
||||
|
||||
// 自定义的墨迹渲染
|
||||
protected override void DrawCore(DrawingContext drawingContext,
|
||||
DrawingAttributes drawingAttributes) {
|
||||
|
||||
if (IsStopOffScreenRender && new StrokeCollection(){this}.HitTest(new Rect(new Point(0,0), new Size(_hostInkCanvas.ActualWidth,_hostInkCanvas.ActualHeight)), 1).Count == 0) return;
|
||||
|
||||
if (!(this.ContainsPropertyData(StrokeIsShapeGuid) &&
|
||||
(bool)this.GetPropertyData(StrokeIsShapeGuid) == true)) {
|
||||
base.DrawCore(drawingContext, drawingAttributes);
|
||||
@ -168,9 +153,8 @@ namespace Ink_Canvas {
|
||||
}
|
||||
|
||||
protected override void OnStrokeCollected(InkCanvasStrokeCollectedEventArgs e) {
|
||||
IccStroke customStroke = new IccStroke(e.Stroke.StylusPoints, e.Stroke.DrawingAttributes, this);
|
||||
IccStroke customStroke = new IccStroke(e.Stroke.StylusPoints, e.Stroke.DrawingAttributes);
|
||||
if (e.Stroke is IccStroke) {
|
||||
if ((e.Stroke as IccStroke)._hostInkCanvas == null) (e.Stroke as IccStroke)._hostInkCanvas = this;
|
||||
this.Strokes.Add(e.Stroke);
|
||||
} else {
|
||||
this.Strokes.Remove(e.Stroke);
|
||||
|
||||
@ -9,7 +9,7 @@ namespace Ink_Canvas {
|
||||
|
||||
public partial class MainWindow : Window {
|
||||
|
||||
public StrokeCollection DrawShapeCore(PointCollection pts, ShapeDrawingType type, bool doNotDisturbutePoints) {
|
||||
public StrokeCollection DrawShapeCore(PointCollection pts, ShapeDrawingType type, bool doNotDisturbutePoints, bool isPreview) {
|
||||
// 线
|
||||
if (type == MainWindow.ShapeDrawingType.Line ||
|
||||
type == MainWindow.ShapeDrawingType.DashedLine ||
|
||||
@ -21,7 +21,7 @@ namespace Ink_Canvas {
|
||||
new StylusPoint(pts[0].X, pts[0].Y),
|
||||
new StylusPoint(pts[1].X, pts[1].Y),
|
||||
}, inkCanvas.DefaultDrawingAttributes.Clone()) {
|
||||
IsDistributePointsOnLineShape = !doNotDisturbutePoints
|
||||
IsDistributePointsOnLineShape = !doNotDisturbutePoints,
|
||||
};
|
||||
stk.AddPropertyData(IccStroke.StrokeIsShapeGuid, true);
|
||||
stk.AddPropertyData(IccStroke.StrokeShapeTypeGuid, (int)type);
|
||||
|
||||
@ -163,7 +163,7 @@ namespace Ink_Canvas {
|
||||
using (DrawingContext dc = DrawingVisualCanvas.DrawingVisual.RenderOpen()) {}
|
||||
|
||||
if (points.Count >= 2)
|
||||
MainWindow.inkCanvas.Strokes.Add(MainWindow.DrawShapeCore(points, (MainWindow.ShapeDrawingType)_shapeType,false));
|
||||
MainWindow.inkCanvas.Strokes.Add(MainWindow.DrawShapeCore(points, (MainWindow.ShapeDrawingType)_shapeType,false,false));
|
||||
points.Clear();
|
||||
AngleTooltip.Visibility = Visibility.Collapsed;
|
||||
LengthTooltip.Visibility = Visibility.Collapsed;
|
||||
@ -181,7 +181,7 @@ namespace Ink_Canvas {
|
||||
_shapeType == MainWindow.ShapeDrawingType.DottedLine ||
|
||||
_shapeType == MainWindow.ShapeDrawingType.ArrowOneSide ||
|
||||
_shapeType == MainWindow.ShapeDrawingType.ArrowTwoSide) && points.Count >= 2) {
|
||||
MainWindow.DrawShapeCore(points, (MainWindow.ShapeDrawingType)_shapeType,true).Draw(dc);
|
||||
MainWindow.DrawShapeCore(points, (MainWindow.ShapeDrawingType)_shapeType,true,true).Draw(dc);
|
||||
var angle = MainWindow.ShapeDrawingHelper.CaculateRotateAngleByGivenTwoPoints(points[0], points[1]);
|
||||
if (AngleTooltip.Visibility == Visibility.Collapsed) AngleTooltip.Visibility = Visibility.Visible;
|
||||
AngleText.Text = $"{angle}°";
|
||||
|
||||
@ -69,11 +69,13 @@ namespace Ink_Canvas {
|
||||
? Settings.Advanced.NibModeBoundsWidthEraserSize
|
||||
: Settings.Advanced.FingerModeBoundsWidthEraserSize);
|
||||
if (Settings.Advanced.IsSpecialScreen) boundWidth *= Settings.Advanced.TouchMultiplier;
|
||||
inkCanvas.EraserShape = new EllipseStylusShape(boundWidth, boundWidth);
|
||||
TouchDownPointsList[e.TouchDevice.Id] = InkCanvasEditingMode.EraseByPoint;
|
||||
eraserWidth = boundWidth;
|
||||
isEraserCircleShape = Settings.Canvas.EraserShapeType == 0;
|
||||
isUsingStrokesEraser = false;
|
||||
inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
|
||||
} else {
|
||||
inkCanvas.EraserShape = new EllipseStylusShape(5, 5);
|
||||
isUsingStrokesEraser = true;
|
||||
inkCanvas.EditingMode = InkCanvasEditingMode.EraseByStroke;
|
||||
}
|
||||
} else {
|
||||
@ -251,10 +253,12 @@ namespace Ink_Canvas {
|
||||
? Settings.Advanced.NibModeBoundsWidthEraserSize
|
||||
: Settings.Advanced.FingerModeBoundsWidthEraserSize);
|
||||
if (Settings.Advanced.IsSpecialScreen) boundsWidth *= Settings.Advanced.TouchMultiplier;
|
||||
inkCanvas.EraserShape = new EllipseStylusShape(boundsWidth, boundsWidth);
|
||||
eraserWidth = boundsWidth;
|
||||
isEraserCircleShape = Settings.Canvas.EraserShapeType == 0;
|
||||
isUsingStrokesEraser = false;
|
||||
inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
|
||||
} else {
|
||||
inkCanvas.EraserShape = new EllipseStylusShape(5, 5);
|
||||
isUsingStrokesEraser = true;
|
||||
inkCanvas.EditingMode = InkCanvasEditingMode.EraseByStroke;
|
||||
}
|
||||
} else {
|
||||
|
||||
@ -48,3 +48,9 @@ ICC 可以支持 WPS，但目前无法同时支持 MSOffice 和 WPS。若要启
|
||||
如果程序在启动后黑屏闪退，请打开 “事件查看器” 搜索有关 InkCanvasForClass 的错误信息并上报给开发者（可以在 GitHub 上提交 Issue，或者和开发者单独沟通）
|
||||
|
||||
> 遇到各种奇葩逗比问题请重启应用程式，如果不行请反馈给Dev解决！
|
||||
|
||||
## CLI
|
||||
|
||||
- `multiple` 以多实例模式启动
|
||||
- `-f --fold` 启动后自动收纳到屏幕两侧
|
||||
- `-r --reset` 启动后重置配置文件到默认状态
|
||||
68
InkCanvasForClass/Settings.icc.config.txt
Normal file
68
InkCanvasForClass/Settings.icc.config.txt
Normal file
@ -0,0 +1,68 @@
|
||||
# icc 的配置文件
|
||||
# ================================================
|
||||
# 语法说明:
|
||||
# 1. 井号后面是注释内容，不会被解释器识别
|
||||
# 2. 单个项目使用 Key=Value 的格式
|
||||
# 3. 有子项目的使用 Key:(subKey1=value1,subKey2=value2) 的格式
|
||||
# 4. 有子项目的且项目本身可以设置值的使用 Key=Value:(subKey1=value1,subKey2=value2) 的格式
|
||||
# 5. 开为 1 ，关为 0，字符串不需要刻意加引号，自动识别，也可以加上双引号。
|
||||
# ================================================
|
||||
|
||||
{icc.config="Default"}
|
||||
|
||||
[config="appearance"]
|
||||
floatingBar:(label=0,icons=1111111111,eraser=0,onlyEraser=0,logo=0,scale=1.00,alpha=1.00,alphaPpt=1.00)
|
||||
whiteBoard:(scale=0.80,time=1,cs=0;csSource=0)
|
||||
quickPanel=0:(icon=0)
|
||||
trayIcon=0
|
||||
|
||||
[config="startup"]
|
||||
run=0:(fold=0,hide=0,admin=0,winChrome=0)
|
||||
|
||||
[config="canvas"]
|
||||
canvas:(cursor=0,eraser=2,hideWExit=0,clearTm=0)
|
||||
whiteBoard:(color=0,pattern=0,defClr=0,defPtrn=0,inkClr=0)
|
||||
select:(mode=0,stylusTip=1,fully=0,clickLock=0)
|
||||
|
||||
[config="gesture"]
|
||||
2fingerMove=0
|
||||
2fingerRotateInk=0
|
||||
oldTouchGesture=1:(spScreen=0,multiple=1,boundsW=5;20,threshold=2.5;2.5,eraserS=0.8;0.8,quadIr=0)
|
||||
mouseGesture=1:(right=1,wheel=0,fWheel=0)
|
||||
winInk:(eraser=0,barrel=0)
|
||||
|
||||
[config="ink-recognition"]
|
||||
inkRecognition=1:(rectSP=1,triSP=1,asShape=1,triRecog=1,rectRecog=1,ellipseRecog=1)
|
||||
|
||||
[config="powerpoint"]
|
||||
powerpoint=1
|
||||
wpsOffice=0
|
||||
slideShowToolBtn=1:(lb=1,rb=1,ls=1,rs=1,bConf=100,sConf=110,clickable=0,autoInk=0,2finger=1,autoSnap=0,autosave=1,memLastIndex=0,hiddenSlide=1,autoplayN=0)
|
||||
|
||||
[config="experimental"]
|
||||
fullScreenHelper=0
|
||||
edgeGesture=0
|
||||
preventClose=1
|
||||
forceTopmost=1
|
||||
alwaysVisible=1
|
||||
floatingBarAlwaysV=1
|
||||
|
||||
[config="automation"]
|
||||
autoFold=1011110011000000110
|
||||
autoKill=0000
|
||||
autoKillFr=00
|
||||
ddb=0001101
|
||||
|
||||
[config="storage"]
|
||||
storage=fr
|
||||
userLocation=
|
||||
|
||||
[config="snapshot"]
|
||||
magnificationApi=0
|
||||
hideIccWin=0
|
||||
clipboard=1
|
||||
ink=0
|
||||
onlyMaxmizeWin=0
|
||||
filename="Screenshot-[YYYY]-[MM]-[DD]-[HH]-[mm]-[ss].png"
|
||||
|
||||
/{icc.config="Settings"}
|
||||
19
InkCanvasForClass/SpecialLuckyRandomConfig.icc.config.txt
Normal file
19
InkCanvasForClass/SpecialLuckyRandomConfig.icc.config.txt
Normal file
@ -0,0 +1,19 @@
|
||||
# icc 随机点名特殊配置文件
|
||||
# 这个语法是 icc 自己实现的，所以比较简陋
|
||||
|
||||
[config="test.luckyrand.list.txt"]
|
||||
forceEnabled=true # 是否强制启用特殊配置，强制启用后不会隐藏设置中的开关，但是可以让开关失效（不保存到文件）
|
||||
|
||||
whiteList[0]=孙笑川 # 井号后面是注释内容，不会识别
|
||||
whiteList[1]=蔡徐坤 # 此处设置的是全局白名单，这个白名单内的名字在所有情况下都不会被随机点名匹配到
|
||||
|
||||
# 此处设置姓名的匹配模式，是包含还是全等于还是开头
|
||||
# 包含 contains ， 全等于 equals ， 开头 startsWith
|
||||
nameMatchingMode=contains
|
||||
|
||||
# 设置动态白名单的开关和数据来源，目前仅支持配置内定义
|
||||
dynamicWhiteListEnabled=true
|
||||
dynamicWhiteListSource=specialConfig
|
||||
|
||||
dynamicWhiteList[0][time]=Mon/Tue/Wed/Thur/Fri;(08:00:00-08:40:00|08:50:00-09:30:00|10:00:00-10:40:00|10:50:00-11:30:00|11:40:00-12:25:00|14:30:00-15:10:00|15:30:00-16:10:00|16:20:00-17:40:00|17:50:00-18:30:00|17:50:00-18:20:00|19:00:00-19:50:00|20:00:00-20:50:00)
|
||||
dynamicWhiteList[0][rule]=
|
||||
Loading…
Reference in New Issue
Block a user