improve:光标显示
This commit is contained in:
@@ -33,6 +33,12 @@
|
||||
Stylus.IsTouchFeedbackEnabled="False">
|
||||
<!--资源中添加命令-->
|
||||
<Window.Resources>
|
||||
<ResourceDictionary>
|
||||
<!-- 合并新橡皮擦资源 -->
|
||||
<ResourceDictionary.MergedDictionaries>
|
||||
<ResourceDictionary Source="MainWindow_cs/MW_Eraser.xaml"/>
|
||||
</ResourceDictionary.MergedDictionaries>
|
||||
|
||||
<c:IsEnabledToOpacityConverter x:Key="IsEnabledToOpacityConverter" />
|
||||
<c:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
|
||||
<c:IntNumberToString x:Key="IntNumberToString" />
|
||||
@@ -121,6 +127,7 @@
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
</ResourceDictionary>
|
||||
</Window.Resources>
|
||||
<!--输入命令绑定-->
|
||||
<Window.InputBindings>
|
||||
@@ -2884,6 +2891,13 @@
|
||||
ManipulationStarting="inkCanvas_ManipulationStarting"
|
||||
SelectionChanged="inkCanvas_SelectionChanged"
|
||||
StrokeCollected="inkCanvas_StrokeCollected" ClipToBounds="False" Background="Transparent" />
|
||||
|
||||
<!-- 新橡皮擦覆盖层 - 用于高级橡皮擦系统 -->
|
||||
<Border x:Name="AdvancedEraserOverlay"
|
||||
Background="Transparent"
|
||||
IsHitTestVisible="False"
|
||||
Loaded="EraserOverlay_Loaded"
|
||||
Panel.ZIndex="1000" />
|
||||
</Grid>
|
||||
|
||||
<Canvas IsHitTestVisible="False">
|
||||
|
||||
@@ -191,6 +191,22 @@ namespace Ink_Canvas {
|
||||
}
|
||||
|
||||
if (inkCanvas1.EditingMode == InkCanvasEditingMode.Ink) forcePointEraser = !forcePointEraser;
|
||||
|
||||
// 处理高级橡皮擦覆盖层的启用/禁用
|
||||
var eraserOverlay = this.FindName("AdvancedEraserOverlay") as Border;
|
||||
if (eraserOverlay != null) {
|
||||
if (inkCanvas1.EditingMode == InkCanvasEditingMode.EraseByPoint) {
|
||||
// 橡皮擦模式下启用覆盖层
|
||||
eraserOverlay.IsHitTestVisible = true;
|
||||
Trace.WriteLine("Advanced Eraser: Overlay enabled in eraser mode");
|
||||
} else {
|
||||
// 其他模式下禁用覆盖层
|
||||
eraserOverlay.IsHitTestVisible = false;
|
||||
// 同时禁用高级橡皮擦系统
|
||||
DisableAdvancedEraserSystem();
|
||||
Trace.WriteLine("Advanced Eraser: Overlay disabled in non-eraser mode");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endregion Ink Canvas
|
||||
|
||||
@@ -0,0 +1,634 @@
|
||||
using System;
|
||||
using System.Diagnostics;
|
||||
using System.Linq;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Ink;
|
||||
using System.Windows.Input;
|
||||
using System.Windows.Media;
|
||||
using Ink_Canvas.Helpers;
|
||||
using System.Windows.Shapes;
|
||||
|
||||
namespace Ink_Canvas {
|
||||
public partial class MainWindow : Window {
|
||||
|
||||
// 新橡皮擦系统的核心变量
|
||||
public bool isUsingAdvancedEraser = false;
|
||||
private IncrementalStrokeHitTester advancedHitTester = null;
|
||||
|
||||
// 橡皮擦配置
|
||||
public double currentEraserSize = 64;
|
||||
public bool isCurrentEraserCircle = false;
|
||||
public bool isUsingStrokeEraser = false;
|
||||
|
||||
// 视觉反馈相关
|
||||
private Matrix eraserTransformMatrix = new Matrix();
|
||||
private Point lastEraserPosition = new Point();
|
||||
private bool isEraserVisible = false;
|
||||
|
||||
// 性能优化相关
|
||||
private DateTime lastEraserUpdate = DateTime.Now;
|
||||
private const double ERASER_UPDATE_INTERVAL = 16.67; // 约60FPS
|
||||
|
||||
// 锁定笔画的GUID（如果不存在则创建一个默认值）
|
||||
private static readonly Guid IsLockGuid = new Guid("12345678-1234-1234-1234-123456789ABC");
|
||||
|
||||
// 橡皮擦视觉反馈控件
|
||||
private DrawingVisual eraserVisual = new DrawingVisual();
|
||||
private VisualCanvas eraserOverlayCanvas = null;
|
||||
private Border eraserVisualBorder = null; // 用于显示橡皮擦视觉反馈的Border
|
||||
|
||||
// 兼容性属性：模拟原有的EraserOverlay_DrawingVisual
|
||||
private VisualCanvas EraserOverlay_DrawingVisual => eraserOverlayCanvas;
|
||||
|
||||
// 兼容性保持
|
||||
[Obsolete("使用 isUsingAdvancedEraser 替代")]
|
||||
public bool isUsingGeometryEraser
|
||||
{
|
||||
get => isUsingAdvancedEraser;
|
||||
set => isUsingAdvancedEraser = value;
|
||||
}
|
||||
|
||||
[Obsolete("使用 currentEraserSize 替代")]
|
||||
public double eraserWidth
|
||||
{
|
||||
get => currentEraserSize;
|
||||
set => currentEraserSize = value;
|
||||
}
|
||||
|
||||
[Obsolete("使用 isCurrentEraserCircle 替代")]
|
||||
public bool isEraserCircleShape
|
||||
{
|
||||
get => isCurrentEraserCircle;
|
||||
set => isCurrentEraserCircle = value;
|
||||
}
|
||||
|
||||
[Obsolete("使用 isUsingStrokeEraser 替代")]
|
||||
public bool isUsingStrokesEraser
|
||||
{
|
||||
get => isUsingStrokeEraser;
|
||||
set => isUsingStrokeEraser = value;
|
||||
}
|
||||
|
||||
[Obsolete("使用 eraserTransformMatrix 替代")]
|
||||
private Matrix scaleMatrix
|
||||
{
|
||||
get => eraserTransformMatrix;
|
||||
set => eraserTransformMatrix = value;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 新橡皮擦覆盖层加载事件处理
|
||||
/// </summary>
|
||||
private void EraserOverlay_Loaded(object sender, RoutedEventArgs e) {
|
||||
var border = (Border)sender;
|
||||
|
||||
// 初始化覆盖层
|
||||
InitializeEraserOverlay(border);
|
||||
|
||||
Trace.WriteLine("Advanced Eraser: Overlay loaded and initialized");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 开始高级橡皮擦操作
|
||||
/// </summary>
|
||||
private void StartAdvancedEraserOperation(object sender) {
|
||||
if (isUsingAdvancedEraser) return;
|
||||
|
||||
// 设置操作状态
|
||||
isUsingAdvancedEraser = true;
|
||||
isEraserVisible = true;
|
||||
|
||||
// 更新橡皮擦尺寸
|
||||
UpdateEraserSize();
|
||||
|
||||
// 获取inkCanvas引用
|
||||
var inkCanvas = this.FindName("inkCanvas") as InkCanvas;
|
||||
if (inkCanvas == null) return;
|
||||
|
||||
// 根据橡皮擦形状创建碰撞检测器
|
||||
StylusShape eraserShape = CreateEraserShape();
|
||||
advancedHitTester = inkCanvas.Strokes.GetIncrementalStrokeHitTester(eraserShape);
|
||||
advancedHitTester.StrokeHit += OnAdvancedEraserStrokeHit;
|
||||
|
||||
// 初始化变换矩阵
|
||||
InitializeEraserTransform();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 创建橡皮擦形状
|
||||
/// </summary>
|
||||
private StylusShape CreateEraserShape() {
|
||||
if (isCurrentEraserCircle) {
|
||||
return new EllipseStylusShape(currentEraserSize, currentEraserSize);
|
||||
} else {
|
||||
// 矩形橡皮擦，使用与原来相同的逻辑
|
||||
return new RectangleStylusShape(currentEraserSize, currentEraserSize / 0.6);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 初始化橡皮擦变换矩阵
|
||||
/// </summary>
|
||||
private void InitializeEraserTransform() {
|
||||
eraserTransformMatrix = new Matrix();
|
||||
|
||||
if (isCurrentEraserCircle) {
|
||||
// 圆形橡皮擦：等比例缩放
|
||||
var scale = currentEraserSize / 56.0; // 基于56x56的基准尺寸
|
||||
eraserTransformMatrix.ScaleAt(scale, scale, 0, 0);
|
||||
} else {
|
||||
// 矩形橡皮擦：保持传统比例
|
||||
var scaleX = currentEraserSize / 38.0;
|
||||
var scaleY = (currentEraserSize * 56 / 38) / 56.0;
|
||||
eraserTransformMatrix.ScaleAt(scaleX, scaleY, 0, 0);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 更新橡皮擦尺寸
|
||||
/// </summary>
|
||||
private void UpdateEraserSize() {
|
||||
// 使用与原来相同的逻辑计算橡皮擦尺寸
|
||||
double k = 1.0;
|
||||
|
||||
switch (Settings.Canvas.EraserSize) {
|
||||
case 0: k = Settings.Canvas.EraserShapeType == 0 ? 0.5 : 0.7; break;
|
||||
case 1: k = Settings.Canvas.EraserShapeType == 0 ? 0.8 : 0.9; break;
|
||||
case 2: k = 1.0; break;
|
||||
case 3: k = Settings.Canvas.EraserShapeType == 0 ? 1.25 : 1.2; break;
|
||||
case 4: k = Settings.Canvas.EraserShapeType == 0 ? 1.5 : 1.3; break;
|
||||
}
|
||||
|
||||
// 更新形状类型
|
||||
isCurrentEraserCircle = (Settings.Canvas.EraserShapeType == 0);
|
||||
|
||||
// 根据形状类型设置尺寸
|
||||
if (isCurrentEraserCircle) {
|
||||
currentEraserSize = k * 90; // 圆形橡皮擦
|
||||
} else {
|
||||
currentEraserSize = k * 90 * 0.6; // 矩形橡皮擦宽度
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 结束高级橡皮擦操作
|
||||
/// </summary>
|
||||
private void EndAdvancedEraserOperation(object sender) {
|
||||
if (!isUsingAdvancedEraser) return;
|
||||
|
||||
// 重置操作状态
|
||||
isUsingAdvancedEraser = false;
|
||||
isEraserVisible = false;
|
||||
|
||||
// 释放鼠标捕获
|
||||
if (sender is Border border) {
|
||||
border.ReleaseMouseCapture();
|
||||
}
|
||||
|
||||
// 隐藏橡皮擦视觉反馈
|
||||
HideEraserFeedback();
|
||||
|
||||
// 结束碰撞检测
|
||||
if (advancedHitTester != null) {
|
||||
advancedHitTester.EndHitTesting();
|
||||
advancedHitTester = null;
|
||||
}
|
||||
|
||||
// 提交橡皮擦历史记录
|
||||
CommitEraserHistory();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 隐藏橡皮擦视觉反馈
|
||||
/// </summary>
|
||||
private void HideEraserFeedback() {
|
||||
try {
|
||||
if (eraserVisualBorder != null) {
|
||||
eraserVisualBorder.Visibility = Visibility.Collapsed;
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
Trace.WriteLine($"Advanced Eraser: Error hiding feedback - {ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 提交橡皮擦历史记录
|
||||
/// </summary>
|
||||
private void CommitEraserHistory() {
|
||||
try {
|
||||
if (ReplacedStroke != null || AddedStroke != null) {
|
||||
timeMachine.CommitStrokeEraseHistory(ReplacedStroke, AddedStroke);
|
||||
AddedStroke = null;
|
||||
ReplacedStroke = null;
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
Trace.WriteLine($"Advanced Eraser: Error committing history - {ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 高级橡皮擦笔画碰撞事件处理
|
||||
/// </summary>
|
||||
private void OnAdvancedEraserStrokeHit(object sender, StrokeHitEventArgs args) {
|
||||
try {
|
||||
var inkCanvas = this.FindName("inkCanvas") as InkCanvas;
|
||||
if (inkCanvas == null) return;
|
||||
|
||||
var eraseResult = args.GetPointEraseResults();
|
||||
var strokeToReplace = new StrokeCollection { args.HitStroke };
|
||||
|
||||
// 过滤锁定的笔画
|
||||
var filteredToReplace = strokeToReplace.Where(stroke => !stroke.ContainsPropertyData(IsLockGuid));
|
||||
var filteredToReplaceArray = filteredToReplace as Stroke[] ?? filteredToReplace.ToArray();
|
||||
|
||||
if (!filteredToReplaceArray.Any()) return;
|
||||
|
||||
var filteredResult = eraseResult.Where(stroke => !stroke.ContainsPropertyData(IsLockGuid));
|
||||
var filteredResultArray = filteredResult as Stroke[] ?? filteredResult.ToArray();
|
||||
|
||||
// 执行笔画替换或删除
|
||||
if (filteredResultArray.Any()) {
|
||||
inkCanvas.Strokes.Replace(
|
||||
new StrokeCollection(filteredToReplaceArray),
|
||||
new StrokeCollection(filteredResultArray)
|
||||
);
|
||||
} else {
|
||||
inkCanvas.Strokes.Remove(new StrokeCollection(filteredToReplaceArray));
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
Trace.WriteLine($"Advanced Eraser: Error in stroke hit - {ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 更新高级橡皮擦位置
|
||||
/// </summary>
|
||||
private void UpdateAdvancedEraserPosition(object sender, Point position) {
|
||||
// 移除isUsingAdvancedEraser检查，让视觉反馈始终更新
|
||||
// if (!isUsingAdvancedEraser) return;
|
||||
|
||||
// 性能优化：限制更新频率
|
||||
var now = DateTime.Now;
|
||||
if ((now - lastEraserUpdate).TotalMilliseconds < ERASER_UPDATE_INTERVAL) {
|
||||
return;
|
||||
}
|
||||
lastEraserUpdate = now;
|
||||
|
||||
// 更新位置
|
||||
lastEraserPosition = position;
|
||||
|
||||
// 更新视觉反馈（始终执行）
|
||||
UpdateEraserVisualFeedback(position);
|
||||
|
||||
// 只有在实际使用橡皮擦时才处理擦除
|
||||
if (isUsingAdvancedEraser) {
|
||||
// 处理不同的橡皮擦模式
|
||||
if (isUsingStrokeEraser) {
|
||||
ProcessStrokeEraserAtPosition(position);
|
||||
} else {
|
||||
ProcessGeometryEraserAtPosition(position);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 在指定位置处理笔画橡皮擦
|
||||
/// </summary>
|
||||
private void ProcessStrokeEraserAtPosition(Point position) {
|
||||
try {
|
||||
var inkCanvas = this.FindName("inkCanvas") as InkCanvas;
|
||||
if (inkCanvas == null) return;
|
||||
|
||||
var hitStrokes = inkCanvas.Strokes.HitTest(position)
|
||||
.Where(stroke => !stroke.ContainsPropertyData(IsLockGuid));
|
||||
var strokesArray = hitStrokes as Stroke[] ?? hitStrokes.ToArray();
|
||||
|
||||
if (strokesArray.Any()) {
|
||||
inkCanvas.Strokes.Remove(new StrokeCollection(strokesArray));
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
Trace.WriteLine($"Advanced Eraser: Error in stroke eraser - {ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 在指定位置处理几何橡皮擦
|
||||
/// </summary>
|
||||
private void ProcessGeometryEraserAtPosition(Point position) {
|
||||
try {
|
||||
if (advancedHitTester != null) {
|
||||
advancedHitTester.AddPoint(position);
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
Trace.WriteLine($"Advanced Eraser: Error in geometry eraser - {ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 更新橡皮擦视觉反馈
|
||||
/// </summary>
|
||||
private void UpdateEraserVisualFeedback(Point position) {
|
||||
try {
|
||||
// 获取或创建橡皮擦视觉反馈Border
|
||||
if (eraserVisualBorder == null) {
|
||||
eraserVisualBorder = new Border {
|
||||
Background = new SolidColorBrush(Colors.White),
|
||||
BorderBrush = new SolidColorBrush(Colors.Transparent),
|
||||
BorderThickness = new Thickness(0),
|
||||
IsHitTestVisible = false,
|
||||
HorizontalAlignment = HorizontalAlignment.Left,
|
||||
VerticalAlignment = VerticalAlignment.Top,
|
||||
Opacity = 0.6
|
||||
};
|
||||
Panel.SetZIndex(eraserVisualBorder, 1001);
|
||||
|
||||
// 将Border添加到InkCanvasGridForInkReplay中
|
||||
var inkCanvasGrid = this.FindName("InkCanvasGridForInkReplay") as Grid;
|
||||
if (inkCanvasGrid != null) {
|
||||
inkCanvasGrid.Children.Add(eraserVisualBorder);
|
||||
Trace.WriteLine("Advanced Eraser: Visual feedback border added to grid");
|
||||
} else {
|
||||
Trace.WriteLine("Advanced Eraser: Failed to find InkCanvasGridForInkReplay");
|
||||
return; // 如果找不到Grid，直接返回
|
||||
}
|
||||
}
|
||||
|
||||
if (eraserVisualBorder != null) {
|
||||
// 更新橡皮擦位置和大小
|
||||
if (isCurrentEraserCircle) {
|
||||
var radius = currentEraserSize / 2;
|
||||
eraserVisualBorder.Width = currentEraserSize;
|
||||
eraserVisualBorder.Height = currentEraserSize;
|
||||
eraserVisualBorder.CornerRadius = new CornerRadius(radius);
|
||||
|
||||
// 使用Margin来定位，因为Border在Grid中
|
||||
eraserVisualBorder.Margin = new Thickness(
|
||||
position.X - radius,
|
||||
position.Y - radius,
|
||||
0, 0);
|
||||
} else {
|
||||
// 矩形橡皮擦，使用与原来相同的逻辑
|
||||
var height = currentEraserSize / 0.6;
|
||||
eraserVisualBorder.Width = currentEraserSize;
|
||||
eraserVisualBorder.Height = height;
|
||||
eraserVisualBorder.CornerRadius = new CornerRadius(0);
|
||||
|
||||
// 使用Margin来定位，因为Border在Grid中
|
||||
eraserVisualBorder.Margin = new Thickness(
|
||||
position.X - currentEraserSize / 2,
|
||||
position.Y - height / 2,
|
||||
0, 0);
|
||||
}
|
||||
|
||||
eraserVisualBorder.Visibility = Visibility.Visible;
|
||||
Trace.WriteLine($"Advanced Eraser: Visual feedback updated to ({position.X:F1}, {position.Y:F1})");
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
Trace.WriteLine($"Advanced Eraser: Error updating visual feedback - {ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 兼容性方法：旧版橡皮擦几何碰撞处理
|
||||
/// </summary>
|
||||
[Obsolete("使用 OnAdvancedEraserStrokeHit 替代")]
|
||||
private void EraserGeometry_StrokeHit(object sender, StrokeHitEventArgs args) {
|
||||
OnAdvancedEraserStrokeHit(sender, args);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 兼容性方法：旧版橡皮擦移动处理
|
||||
/// </summary>
|
||||
[Obsolete("使用 UpdateAdvancedEraserPosition 替代")]
|
||||
private void EraserOverlay_PointerMove(object sender, Point pt) {
|
||||
UpdateAdvancedEraserPosition(sender, pt);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 兼容性方法：旧版橡皮擦按下处理
|
||||
/// </summary>
|
||||
[Obsolete("使用 StartAdvancedEraserOperation 替代")]
|
||||
private void EraserOverlay_PointerDown(object sender) {
|
||||
StartAdvancedEraserOperation(sender);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 兼容性方法：旧版橡皮擦抬起处理
|
||||
/// </summary>
|
||||
[Obsolete("使用 EndAdvancedEraserOperation 替代")]
|
||||
private void EraserOverlay_PointerUp(object sender) {
|
||||
EndAdvancedEraserOperation(sender);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取当前橡皮擦状态信息（用于调试）
|
||||
/// </summary>
|
||||
public string GetEraserStatusInfo() {
|
||||
return $"Advanced Eraser Status:\n" +
|
||||
$"- Active: {isUsingAdvancedEraser}\n" +
|
||||
$"- Size: {currentEraserSize:F1}\n" +
|
||||
$"- Shape: {(isCurrentEraserCircle ? "Circle" : "Rectangle")}\n" +
|
||||
$"- Mode: {(isUsingStrokeEraser ? "Stroke" : "Geometry")}\n" +
|
||||
$"- Visible: {isEraserVisible}\n" +
|
||||
$"- Last Position: ({lastEraserPosition.X:F1}, {lastEraserPosition.Y:F1})";
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 重置橡皮擦状态
|
||||
/// </summary>
|
||||
public void ResetEraserState() {
|
||||
isUsingAdvancedEraser = false;
|
||||
isEraserVisible = false;
|
||||
lastEraserPosition = new Point();
|
||||
|
||||
if (advancedHitTester != null) {
|
||||
advancedHitTester.EndHitTesting();
|
||||
advancedHitTester = null;
|
||||
}
|
||||
|
||||
HideEraserFeedback();
|
||||
|
||||
// 清理视觉反馈Border
|
||||
if (eraserVisualBorder != null) {
|
||||
var inkCanvasGrid = this.FindName("InkCanvasGridForInkReplay") as Grid;
|
||||
if (inkCanvasGrid != null) {
|
||||
inkCanvasGrid.Children.Remove(eraserVisualBorder);
|
||||
}
|
||||
eraserVisualBorder = null;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 应用高级橡皮擦形状到InkCanvas
|
||||
/// </summary>
|
||||
public void ApplyAdvancedEraserShape() {
|
||||
try {
|
||||
var inkCanvas = this.FindName("inkCanvas") as InkCanvas;
|
||||
if (inkCanvas == null) return;
|
||||
|
||||
// 更新橡皮擦尺寸和形状
|
||||
UpdateEraserSize();
|
||||
|
||||
// 创建橡皮擦形状
|
||||
StylusShape eraserShape = CreateEraserShape();
|
||||
|
||||
// 应用到InkCanvas
|
||||
inkCanvas.EraserShape = eraserShape;
|
||||
|
||||
Trace.WriteLine($"Advanced Eraser: Applied shape - Size: {currentEraserSize}, Circle: {isCurrentEraserCircle}");
|
||||
} catch (Exception ex) {
|
||||
Trace.WriteLine($"Advanced Eraser: Error applying shape - {ex.Message}");
|
||||
|
||||
// 回退到传统方法
|
||||
try {
|
||||
ApplyCurrentEraserShape();
|
||||
} catch (Exception fallbackEx) {
|
||||
Trace.WriteLine($"Advanced Eraser: Fallback also failed - {fallbackEx.Message}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 启用高级橡皮擦系统
|
||||
/// </summary>
|
||||
public void EnableAdvancedEraserSystem() {
|
||||
try {
|
||||
// 获取橡皮擦覆盖层
|
||||
var eraserOverlay = this.FindName("AdvancedEraserOverlay") as Border;
|
||||
if (eraserOverlay != null) {
|
||||
// 启用覆盖层的交互
|
||||
eraserOverlay.IsHitTestVisible = true;
|
||||
|
||||
// 确保覆盖层在橡皮擦模式下启用
|
||||
if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) {
|
||||
eraserOverlay.IsHitTestVisible = true;
|
||||
Trace.WriteLine("Advanced Eraser: Overlay enabled for eraser mode");
|
||||
}
|
||||
|
||||
// 设置覆盖层的大小以覆盖整个InkCanvas
|
||||
var inkCanvasControl = this.FindName("inkCanvas") as InkCanvas;
|
||||
if (inkCanvasControl != null) {
|
||||
eraserOverlay.Width = inkCanvasControl.ActualWidth;
|
||||
eraserOverlay.Height = inkCanvasControl.ActualHeight;
|
||||
Trace.WriteLine($"Advanced Eraser: Overlay size set to {eraserOverlay.Width}x{eraserOverlay.Height}");
|
||||
}
|
||||
|
||||
Trace.WriteLine("Advanced Eraser: System enabled successfully");
|
||||
} else {
|
||||
Trace.WriteLine("Advanced Eraser: Failed to find eraser overlay");
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
Trace.WriteLine($"Advanced Eraser: Error enabling system - {ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 初始化橡皮擦覆盖层
|
||||
/// </summary>
|
||||
private void InitializeEraserOverlay(Border overlay) {
|
||||
try {
|
||||
// 设置覆盖层的基本属性
|
||||
overlay.Background = new SolidColorBrush(Colors.Transparent);
|
||||
overlay.IsHitTestVisible = false; // 默认禁用，只在橡皮擦模式下启用
|
||||
|
||||
// 绑定事件处理
|
||||
overlay.MouseDown += (sender, e) => {
|
||||
if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) {
|
||||
overlay.CaptureMouse();
|
||||
StartAdvancedEraserOperation(sender);
|
||||
}
|
||||
};
|
||||
|
||||
overlay.MouseUp += (sender, e) => {
|
||||
if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) {
|
||||
overlay.ReleaseMouseCapture();
|
||||
EndAdvancedEraserOperation(sender);
|
||||
}
|
||||
};
|
||||
|
||||
overlay.MouseMove += (sender, e) => {
|
||||
if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) {
|
||||
var position = e.GetPosition((UIElement)this.FindName("inkCanvas"));
|
||||
Trace.WriteLine($"Advanced Eraser: Mouse move event triggered at ({position.X:F1}, {position.Y:F1})");
|
||||
UpdateAdvancedEraserPosition(sender, position);
|
||||
} else {
|
||||
Trace.WriteLine($"Advanced Eraser: Mouse move ignored - not in eraser mode, current mode: {inkCanvas.EditingMode}");
|
||||
}
|
||||
};
|
||||
|
||||
// 触控笔事件
|
||||
overlay.StylusDown += (sender, e) => {
|
||||
if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) {
|
||||
e.Handled = true;
|
||||
if (e.StylusDevice.TabletDevice.Type == TabletDeviceType.Stylus) {
|
||||
overlay.CaptureStylus();
|
||||
}
|
||||
StartAdvancedEraserOperation(sender);
|
||||
}
|
||||
};
|
||||
|
||||
overlay.StylusUp += (sender, e) => {
|
||||
if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) {
|
||||
e.Handled = true;
|
||||
if (e.StylusDevice.TabletDevice.Type == TabletDeviceType.Stylus) {
|
||||
overlay.ReleaseStylusCapture();
|
||||
}
|
||||
EndAdvancedEraserOperation(sender);
|
||||
}
|
||||
};
|
||||
|
||||
overlay.StylusMove += (sender, e) => {
|
||||
if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) {
|
||||
e.Handled = true;
|
||||
var position = e.GetPosition((UIElement)this.FindName("inkCanvas"));
|
||||
UpdateAdvancedEraserPosition(sender, position);
|
||||
Trace.WriteLine($"Advanced Eraser: Stylus move at ({position.X:F1}, {position.Y:F1})");
|
||||
}
|
||||
};
|
||||
|
||||
Trace.WriteLine("Advanced Eraser: Overlay initialized successfully");
|
||||
} catch (Exception ex) {
|
||||
Trace.WriteLine($"Advanced Eraser: Error initializing overlay - {ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 禁用高级橡皮擦系统
|
||||
/// </summary>
|
||||
public void DisableAdvancedEraserSystem() {
|
||||
try {
|
||||
// 重置橡皮擦状态
|
||||
ResetEraserState();
|
||||
|
||||
// 获取橡皮擦覆盖层并禁用
|
||||
var eraserOverlay = this.FindName("AdvancedEraserOverlay") as Border;
|
||||
if (eraserOverlay != null) {
|
||||
eraserOverlay.IsHitTestVisible = false;
|
||||
}
|
||||
|
||||
// 确保视觉反馈被隐藏
|
||||
HideEraserFeedback();
|
||||
|
||||
Trace.WriteLine("Advanced Eraser: System disabled successfully");
|
||||
} catch (Exception ex) {
|
||||
Trace.WriteLine($"Advanced Eraser: Error disabling system - {ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 切换橡皮擦形状（圆形/矩形）
|
||||
/// </summary>
|
||||
public void ToggleEraserShape() {
|
||||
isCurrentEraserCircle = !isCurrentEraserCircle;
|
||||
|
||||
// 更新设置
|
||||
Settings.Canvas.EraserShapeType = isCurrentEraserCircle ? 0 : 1;
|
||||
|
||||
// 应用新形状
|
||||
ApplyAdvancedEraserShape();
|
||||
|
||||
Trace.WriteLine($"Advanced Eraser: Toggled to {(isCurrentEraserCircle ? "Circle" : "Rectangle")}");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,140 @@
|
||||
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||
|
||||
<!-- 新版矩形橡皮擦 - 更现代的设计 -->
|
||||
<DrawingGroup x:Key="EraserDrawingGroup" ClipGeometry="M0,0 V56 H38 V0 H0 Z">
|
||||
<!-- 主体背景 - 使用渐变效果 -->
|
||||
<GeometryDrawing Geometry="F1 M38,56z M0,0z M0,4C0,1.79086,1.79086,0,4,0L34,0C36.2091,0,38,1.79086,38,4L38,52C38,54.2091,36.2091,56,34,56L4,56C1.79086,56,0,54.2091,0,52L0,4z">
|
||||
<GeometryDrawing.Brush>
|
||||
<LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
|
||||
<GradientStop Color="#FFF8F6F4" Offset="0"/>
|
||||
<GradientStop Color="#FFE8E4E0" Offset="1"/>
|
||||
</LinearGradientBrush>
|
||||
</GeometryDrawing.Brush>
|
||||
</GeometryDrawing>
|
||||
|
||||
<!-- 边框 - 更精细的边框设计 -->
|
||||
<GeometryDrawing Geometry="F0 M38,56z M0,0z M34,1L4,1C2.34315,1,1,2.34315,1,4L1,52C1,53.6569,2.34315,55,4,55L34,55C35.6569,55,37,53.6569,37,52L37,4C37,2.34315,35.6569,1,34,1z M4,0C1.79086,0,0,1.79086,0,4L0,52C0,54.2091,1.79086,56,4,56L34,56C36.2091,56,38,54.2091,38,52L38,4C38,1.79086,36.2091,0,34,0L4,0z">
|
||||
<GeometryDrawing.Brush>
|
||||
<SolidColorBrush Color="#FFB8B4B0" Opacity="0.8"/>
|
||||
</GeometryDrawing.Brush>
|
||||
</GeometryDrawing>
|
||||
|
||||
<!-- 左侧纹理条 -->
|
||||
<GeometryDrawing Brush="#FFD4D0CC" Geometry="F1 M38,56z M0,0z M12,19.5C12,18.1193,13.1193,17,14.5,17L14.5,17C15.8807,17,17,18.1193,17,19.5L17,36.5C17,37.8807,15.8807,39,14.5,39L14.5,39C13.1193,39,12,37.8807,12,36.5L12,19.5z" />
|
||||
|
||||
<!-- 左侧纹理条阴影 -->
|
||||
<GeometryDrawing Geometry="F0 M38,56z M0,0z M11.5,19.5C11.5,17.8431 12.8431,16.5 14.5,16.5 16.1569,16.5 17.5,17.8431 17.5,19.5L17.5,36.5C17.5,38.1569 16.1569,39.5 14.5,39.5 12.8431,39.5 11.5,38.1569 11.5,36.5L11.5,19.5z M14.5,17.5C13.3954,17.5,12.5,18.3954,12.5,19.5L12.5,36.5C12.5,37.6046 13.3954,38.5 14.5,38.5 15.6046,38.5 16.5,37.6046 16.5,36.5L16.5,19.5C16.5,18.3954,15.6046,17.5,14.5,17.5z">
|
||||
<GeometryDrawing.Brush>
|
||||
<SolidColorBrush Color="#FF8A8680" Opacity="0.3" />
|
||||
</GeometryDrawing.Brush>
|
||||
</GeometryDrawing>
|
||||
|
||||
<!-- 右侧纹理条 -->
|
||||
<GeometryDrawing Brush="#FFD4D0CC" Geometry="F1 M38,56z M0,0z M21,19.5C21,18.1193,22.1193,17,23.5,17L23.5,17C24.8807,17,26,18.1193,26,19.5L26,36.5C26,37.8807,24.8807,39,23.5,39L23.5,39C22.1193,39,21,37.8807,21,36.5L21,19.5z" />
|
||||
|
||||
<!-- 右侧纹理条阴影 -->
|
||||
<GeometryDrawing Geometry="F0 M38,56z M0,0z M20.5,19.5C20.5,17.8431 21.8431,16.5 23.5,16.5 25.1569,16.5 26.5,17.8431 26.5,19.5L26.5,36.5C26.5,38.1569 25.1569,39.5 23.5,39.5 21.8431,39.5 20.5,38.1569 20.5,36.5L20.5,19.5z M23.5,17.5C22.3954,17.5,21.5,18.3954,21.5,19.5L21.5,36.5C21.5,37.6046 22.3954,38.5 23.5,38.5 24.6046,38.5 25.5,37.6046 25.5,36.5L25.5,19.5C25.5,18.3954,24.6046,17.5,23.5,17.5z">
|
||||
<GeometryDrawing.Brush>
|
||||
<SolidColorBrush Color="#FF8A8680" Opacity="0.3" />
|
||||
</GeometryDrawing.Brush>
|
||||
</GeometryDrawing>
|
||||
|
||||
<!-- 高光效果 -->
|
||||
<GeometryDrawing Geometry="F1 M38,56z M0,0z M2,4C2,2.89543,2.89543,2,4,2L34,2C35.1046,2,36,2.89543,36,4L36,12L2,12L2,4z">
|
||||
<GeometryDrawing.Brush>
|
||||
<LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
|
||||
<GradientStop Color="#40FFFFFF" Offset="0"/>
|
||||
<GradientStop Color="#00FFFFFF" Offset="1"/>
|
||||
</LinearGradientBrush>
|
||||
</GeometryDrawing.Brush>
|
||||
</GeometryDrawing>
|
||||
</DrawingGroup>
|
||||
|
||||
<!-- 新版圆形橡皮擦 - 更现代的设计 -->
|
||||
<DrawingGroup x:Key="EraserCircleDrawingGroup" ClipGeometry="M0,0 V56 H56 V0 H0 Z">
|
||||
<!-- 主体背景 - 使用径向渐变效果 -->
|
||||
<GeometryDrawing Geometry="F1 M56,56z M0,0z M0,28C0,12.536,12.536,0,28,0L28,0C43.464,0,56,12.536,56,28L56,28C56,43.464,43.464,56,28,56L28,56C12.536,56,0,43.464,0,28L0,28z">
|
||||
<GeometryDrawing.Brush>
|
||||
<RadialGradientBrush Center="0.3,0.3" RadiusX="0.8" RadiusY="0.8">
|
||||
<GradientStop Color="#FFFCFAF8" Offset="0"/>
|
||||
<GradientStop Color="#FFE8E4E0" Offset="0.7"/>
|
||||
<GradientStop Color="#FFD4D0CC" Offset="1"/>
|
||||
</RadialGradientBrush>
|
||||
</GeometryDrawing.Brush>
|
||||
</GeometryDrawing>
|
||||
|
||||
<!-- 边框 - 更精细的边框设计 -->
|
||||
<GeometryDrawing Geometry="F0 M56,56z M0,0z M1,28C1,42.9117 13.0883,55 28,55 42.9117,55 55,42.9117 55,28 55,13.0883 42.9117,1 28,1 13.0883,1 1,13.0883 1,28z M28,0C12.536,0 0,12.536 0,28 0,43.464 12.536,56 28,56 43.464,56 56,43.464 56,28 56,12.536 43.464,0 28,0z">
|
||||
<GeometryDrawing.Brush>
|
||||
<SolidColorBrush Color="#FFB8B4B0" Opacity="0.8"/>
|
||||
</GeometryDrawing.Brush>
|
||||
</GeometryDrawing>
|
||||
|
||||
<!-- 左侧纹理条 -->
|
||||
<GeometryDrawing Brush="#FFD4D0CC" Geometry="F1 M56,56z M0,0z M21,19.5C21,18.1193,22.1193,17,23.5,17L23.5,17C24.8807,17,26,18.1193,26,19.5L26,36.5C26,37.8807,24.8807,39,23.5,39L23.5,39C22.1193,39,21,37.8807,21,36.5L21,19.5z" />
|
||||
|
||||
<!-- 左侧纹理条阴影 -->
|
||||
<GeometryDrawing Geometry="F0 M56,56z M0,0z M20.5,19.5C20.5,17.8431 21.8431,16.5 23.5,16.5 25.1569,16.5 26.5,17.8431 26.5,19.5L26.5,36.5C26.5,38.1569 25.1569,39.5 23.5,39.5 21.8431,39.5 20.5,38.1569 20.5,36.5L20.5,19.5z M23.5,17.5C22.3954,17.5,21.5,18.3954,21.5,19.5L21.5,36.5C21.5,37.6046 22.3954,38.5 23.5,38.5 24.6046,38.5 25.5,37.6046 25.5,36.5L25.5,19.5C25.5,18.3954,24.6046,17.5,23.5,17.5z">
|
||||
<GeometryDrawing.Brush>
|
||||
<SolidColorBrush Color="#FF8A8680" Opacity="0.3" />
|
||||
</GeometryDrawing.Brush>
|
||||
</GeometryDrawing>
|
||||
|
||||
<!-- 右侧纹理条 -->
|
||||
<GeometryDrawing Brush="#FFD4D0CC" Geometry="F1 M56,56z M0,0z M30,19.5C30,18.1193,31.1193,17,32.5,17L32.5,17C33.8807,17,35,18.1193,35,19.5L35,36.5C35,37.8807,33.8807,39,32.5,39L32.5,39C31.1193,39,30,37.8807,30,36.5L30,19.5z" />
|
||||
|
||||
<!-- 右侧纹理条阴影 -->
|
||||
<GeometryDrawing Geometry="F0 M56,56z M0,0z M29.5,19.5C29.5,17.8431 30.8431,16.5 32.5,16.5 34.1569,16.5 35.5,17.8431 35.5,19.5L35.5,36.5C35.5,38.1569 34.1569,39.5 32.5,39.5 30.8431,39.5 29.5,38.1569 29.5,36.5L29.5,19.5z M32.5,17.5C31.3954,17.5,30.5,18.3954,30.5,19.5L30.5,36.5C30.5,37.6046 31.3954,38.5 32.5,38.5 33.6046,38.5 34.5,37.6046 34.5,36.5L34.5,19.5C34.5,18.3954,33.6046,17.5,32.5,17.5z">
|
||||
<GeometryDrawing.Brush>
|
||||
<SolidColorBrush Color="#FF8A8680" Opacity="0.3" />
|
||||
</GeometryDrawing.Brush>
|
||||
</GeometryDrawing>
|
||||
|
||||
<!-- 高光效果 -->
|
||||
<GeometryDrawing Geometry="F1 M56,56z M0,0z M14,14C20.6274,14,26,19.3726,26,26C26,32.6274,20.6274,38,14,38C7.37258,38,2,32.6274,2,26C2,19.3726,7.37258,14,14,14z">
|
||||
<GeometryDrawing.Brush>
|
||||
<RadialGradientBrush Center="0.3,0.3" RadiusX="0.6" RadiusY="0.6">
|
||||
<GradientStop Color="#60FFFFFF" Offset="0"/>
|
||||
<GradientStop Color="#20FFFFFF" Offset="0.7"/>
|
||||
<GradientStop Color="#00FFFFFF" Offset="1"/>
|
||||
</RadialGradientBrush>
|
||||
</GeometryDrawing.Brush>
|
||||
</GeometryDrawing>
|
||||
|
||||
<!-- 内部阴影效果 -->
|
||||
<GeometryDrawing Geometry="F0 M56,56z M0,0z M3,28C3,41.8071 14.1929,53 28,53 41.8071,53 53,41.8071 53,28 53,14.1929 41.8071,3 28,3 14.1929,3 3,14.1929 3,28z M28,2C13.6406,2 2,13.6406 2,28 2,42.3594 13.6406,54 28,54 42.3594,54 54,42.3594 54,28 54,13.6406 42.3594,2 28,2z">
|
||||
<GeometryDrawing.Brush>
|
||||
<SolidColorBrush Color="#FF6B6760" Opacity="0.2"/>
|
||||
</GeometryDrawing.Brush>
|
||||
</GeometryDrawing>
|
||||
</DrawingGroup>
|
||||
|
||||
<!-- 新增：现代化的橡皮擦预览圆圈 -->
|
||||
<DrawingGroup x:Key="EraserPreviewCircle" ClipGeometry="M0,0 V100 H100 V0 H0 Z">
|
||||
<GeometryDrawing Geometry="F1 M100,100z M0,0z M0,50C0,22.386,22.386,0,50,0L50,0C77.614,0,100,22.386,100,50L100,50C100,77.614,77.614,100,50,100L50,100C22.386,100,0,77.614,0,50L0,50z">
|
||||
<GeometryDrawing.Brush>
|
||||
<SolidColorBrush Color="#40FF6B6B" />
|
||||
</GeometryDrawing.Brush>
|
||||
</GeometryDrawing>
|
||||
<GeometryDrawing Geometry="F0 M100,100z M0,0z M2,50C2,76.5097 23.4903,98 50,98 76.5097,98 98,76.5097 98,50 98,23.4903 76.5097,2 50,2 23.4903,2 2,23.4903 2,50z M50,0C22.386,0 0,22.386 0,50 0,77.614 22.386,100 50,100 77.614,100 100,77.614 100,50 100,22.386 77.614,0 50,0z">
|
||||
<GeometryDrawing.Brush>
|
||||
<SolidColorBrush Color="#80FF4444" />
|
||||
</GeometryDrawing.Brush>
|
||||
</GeometryDrawing>
|
||||
</DrawingGroup>
|
||||
|
||||
<!-- 新增：现代化的橡皮擦预览矩形 -->
|
||||
<DrawingGroup x:Key="EraserPreviewRectangle" ClipGeometry="M0,0 V100 H75 V0 H0 Z">
|
||||
<GeometryDrawing Geometry="F1 M75,100z M0,0z M0,8C0,3.58172,3.58172,0,8,0L67,0C71.4183,0,75,3.58172,75,8L75,92C75,96.4183,71.4183,100,67,100L8,100C3.58172,100,0,96.4183,0,92L0,8z">
|
||||
<GeometryDrawing.Brush>
|
||||
<SolidColorBrush Color="#40FF6B6B" />
|
||||
</GeometryDrawing.Brush>
|
||||
</GeometryDrawing>
|
||||
<GeometryDrawing Geometry="F0 M75,100z M0,0z M67,2L8,2C4.68629,2,2,4.68629,2,8L2,92C2,95.3137,4.68629,98,8,98L67,98C70.3137,98,73,95.3137,73,92L73,8C73,4.68629,70.3137,2,67,2z M8,0C3.58172,0,0,3.58172,0,8L0,92C0,96.4183,3.58172,100,8,100L67,100C71.4183,100,75,96.4183,75,92L75,8C75,3.58172,71.4183,0,67,0L8,0z">
|
||||
<GeometryDrawing.Brush>
|
||||
<SolidColorBrush Color="#80FF4444" />
|
||||
</GeometryDrawing.Brush>
|
||||
</GeometryDrawing>
|
||||
</DrawingGroup>
|
||||
</ResourceDictionary>
|
||||
@@ -1277,6 +1277,10 @@ namespace Ink_Canvas {
|
||||
if (lastBorderMouseDownObject != null && lastBorderMouseDownObject is Panel)
|
||||
((Panel)lastBorderMouseDownObject).Background = new SolidColorBrush(Colors.Transparent);
|
||||
if (sender==Cursor_Icon && lastBorderMouseDownObject != Cursor_Icon) return;
|
||||
|
||||
// 禁用高级橡皮擦系统
|
||||
DisableAdvancedEraserSystem();
|
||||
|
||||
// 隱藏高亮
|
||||
FloatingbarSelectionBG.Visibility = Visibility.Hidden;
|
||||
System.Windows.Controls.Canvas.SetLeft(FloatingbarSelectionBG, 0);
|
||||
@@ -1355,6 +1359,9 @@ namespace Ink_Canvas {
|
||||
((Panel)lastBorderMouseDownObject).Background = new SolidColorBrush(Colors.Transparent);
|
||||
if (sender == Pen_Icon && lastBorderMouseDownObject != Pen_Icon) return;
|
||||
|
||||
// 禁用高级橡皮擦系统
|
||||
DisableAdvancedEraserSystem();
|
||||
|
||||
FloatingbarSelectionBG.Visibility = Visibility.Visible;
|
||||
System.Windows.Controls.Canvas.SetLeft(FloatingbarSelectionBG, 28);
|
||||
|
||||
@@ -1446,10 +1453,20 @@ namespace Ink_Canvas {
|
||||
forcePointEraser = true;
|
||||
isLastTouchEraser = false;
|
||||
drawingShapeMode = 0;
|
||||
|
||||
// 启用新的高级橡皮擦系统
|
||||
EnableAdvancedEraserSystem();
|
||||
|
||||
// 使用新的高级橡皮擦系统
|
||||
inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
|
||||
ApplyCurrentEraserShape();
|
||||
ApplyAdvancedEraserShape(); // 使用新的橡皮擦形状应用方法
|
||||
SetCursorBasedOnEditingMode(inkCanvas);
|
||||
HideSubPanels("eraser"); // 高亮橡皮按钮
|
||||
|
||||
// 显示橡皮擦视觉反馈（用于测试）
|
||||
// 注意：eraserVisualBorder在MW_Eraser.cs中定义，这里无法直接访问
|
||||
Trace.WriteLine($"Advanced Eraser: Eraser button clicked, current size: {currentEraserSize}, circle: {isCurrentEraserCircle}");
|
||||
|
||||
if (isAlreadyEraser) {
|
||||
// 已是橡皮状态，再次点击才弹出/收起面板
|
||||
if (EraserSizePanel.Visibility == Visibility.Collapsed) {
|
||||
@@ -1471,10 +1488,16 @@ namespace Ink_Canvas {
|
||||
forcePointEraser = true;
|
||||
isLastTouchEraser = false;
|
||||
drawingShapeMode = 0;
|
||||
|
||||
// 启用新的高级橡皮擦系统
|
||||
EnableAdvancedEraserSystem();
|
||||
|
||||
// 使用新的高级橡皮擦系统
|
||||
inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
|
||||
ApplyCurrentEraserShape();
|
||||
ApplyAdvancedEraserShape(); // 使用新的橡皮擦形状应用方法
|
||||
SetCursorBasedOnEditingMode(inkCanvas);
|
||||
HideSubPanels("eraser"); // 高亮橡皮按钮
|
||||
|
||||
if (isAlreadyEraser) {
|
||||
// 已是橡皮状态，再次点击才弹出/收起面板
|
||||
if (BoardEraserSizePanel != null && BoardEraserSizePanel.Visibility == Visibility.Collapsed) {
|
||||
@@ -1522,6 +1545,9 @@ namespace Ink_Canvas {
|
||||
}
|
||||
|
||||
private void SelectIcon_MouseUp(object sender, RoutedEvent e) {
|
||||
// 禁用高级橡皮擦系统
|
||||
DisableAdvancedEraserSystem();
|
||||
|
||||
forceEraser = true;
|
||||
drawingShapeMode = 0;
|
||||
inkCanvas.IsManipulationEnabled = false;
|
||||
|
||||
@@ -869,7 +869,10 @@ namespace Ink_Canvas {
|
||||
private void ComboBoxEraserSize_SelectionChanged(object sender, SelectionChangedEventArgs e) {
|
||||
if (!isLoaded) return;
|
||||
Settings.Canvas.EraserSize = ComboBoxEraserSize.SelectedIndex;
|
||||
ApplyCurrentEraserShape();
|
||||
|
||||
// 使用新的高级橡皮擦形状应用方法
|
||||
ApplyAdvancedEraserShape();
|
||||
|
||||
if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) {
|
||||
inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
|
||||
inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
|
||||
@@ -888,7 +891,10 @@ namespace Ink_Canvas {
|
||||
ComboBoxEraserSizeFloatingBar.SelectedIndex = s.SelectedIndex;
|
||||
ComboBoxEraserSize.SelectedIndex = s.SelectedIndex;
|
||||
}
|
||||
ApplyCurrentEraserShape();
|
||||
|
||||
// 使用新的高级橡皮擦形状应用方法
|
||||
ApplyAdvancedEraserShape();
|
||||
|
||||
if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) {
|
||||
inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
|
||||
inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
|
||||
@@ -902,8 +908,8 @@ namespace Ink_Canvas {
|
||||
SaveSettingsToFile();
|
||||
CheckEraserTypeTab();
|
||||
|
||||
// 使用统一的方法应用橡皮擦形状
|
||||
ApplyCurrentEraserShape();
|
||||
// 使用新的高级橡皮擦形状应用方法
|
||||
ApplyAdvancedEraserShape();
|
||||
|
||||
// 确保当前处于橡皮擦模式时能立即看到效果
|
||||
inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
|
||||
@@ -916,8 +922,8 @@ namespace Ink_Canvas {
|
||||
SaveSettingsToFile();
|
||||
CheckEraserTypeTab();
|
||||
|
||||
// 使用统一的方法应用橡皮擦形状
|
||||
ApplyCurrentEraserShape();
|
||||
// 使用新的高级橡皮擦形状应用方法
|
||||
ApplyAdvancedEraserShape();
|
||||
|
||||
// 确保当前处于橡皮擦模式时能立即看到效果
|
||||
inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
|
||||
|
||||
@@ -103,6 +103,9 @@ namespace Ink_Canvas {
|
||||
}
|
||||
|
||||
private void BtnPen_Click(object sender, RoutedEventArgs e) {
|
||||
// 禁用高级橡皮擦系统
|
||||
DisableAdvancedEraserSystem();
|
||||
|
||||
// 如果当前已是批注模式，再次点击弹出批注子面板
|
||||
if (penType == 0 && inkCanvas.EditingMode == InkCanvasEditingMode.Ink && !drawingAttributes.IsHighlighter) {
|
||||
return;
|
||||
|
||||
@@ -10,11 +10,11 @@ none
|
||||
false
|
||||
TRACE;DEBUG;NETFRAMEWORK;NET472;;NET30_OR_GREATER;NET35_OR_GREATER;NET40_OR_GREATER;NET45_OR_GREATER;NET451_OR_GREATER;NET452_OR_GREATER;NET46_OR_GREATER;NET461_OR_GREATER;NET462_OR_GREATER;NET47_OR_GREATER;NET471_OR_GREATER;NET472_OR_GREATER
|
||||
E:\ICC CE\ICC CE main\community\Ink Canvas\App.xaml
|
||||
201780504554
|
||||
21348134359
|
||||
|
||||
72875899768
|
||||
731095817143
|
||||
46-932173576
|
||||
Helpers\Plugins\BuiltIn\SuperLauncher\LauncherSettingsControl.xaml;Helpers\Plugins\BuiltIn\SuperLauncher\LauncherWindow.xaml;MainWindow.xaml;Resources\DrawShapeImageDictionary.xaml;Resources\IconImageDictionary.xaml;Resources\SeewoImageDictionary.xaml;Resources\Styles\Dark.xaml;Resources\Styles\Light.xaml;Windows\AddCustomIconWindow.xaml;Windows\AddPickNameBackgroundWindow.xaml;Windows\CountdownTimerWindow.xaml;Windows\CustomIconWindow.xaml;Windows\CycleProcessBar.xaml;Windows\HasNewUpdateWindow.xaml;Windows\ManagePickNameBackgroundsWindow.xaml;Windows\NamesInputWindow.xaml;Windows\OperatingGuideWindow.xaml;Windows\PluginSettingsWindow.xaml;Windows\RandWindow.xaml;Windows\YesOrNoNotificationWindow.xaml;
|
||||
Helpers\Plugins\BuiltIn\SuperLauncher\LauncherSettingsControl.xaml;Helpers\Plugins\BuiltIn\SuperLauncher\LauncherWindow.xaml;MainWindow.xaml;MainWindow_cs\MW_Eraser.xaml;Resources\DrawShapeImageDictionary.xaml;Resources\IconImageDictionary.xaml;Resources\SeewoImageDictionary.xaml;Resources\Styles\Dark.xaml;Resources\Styles\Light.xaml;Windows\AddCustomIconWindow.xaml;Windows\AddPickNameBackgroundWindow.xaml;Windows\CountdownTimerWindow.xaml;Windows\CustomIconWindow.xaml;Windows\CycleProcessBar.xaml;Windows\HasNewUpdateWindow.xaml;Windows\ManagePickNameBackgroundsWindow.xaml;Windows\NamesInputWindow.xaml;Windows\OperatingGuideWindow.xaml;Windows\PluginSettingsWindow.xaml;Windows\RandWindow.xaml;Windows\YesOrNoNotificationWindow.xaml;
|
||||
|
||||
False
|
||||
|
||||
|
||||
Reference in New Issue
Block a user