CJKmkp/community
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve:图片插入

Browse Source
This commit is contained in:
CJKmkp
2025-08-31 09:12:30 +08:00
parent 8d76c014c8
commit 658d48c17b
4 changed files with 44 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/MainWindow.xaml.cs
+4
View File
@@ -1003,7 +1003,11 @@ namespace Ink_Canvas
// 如果当前有选中的元素，取消选中状态
if (currentSelectedElement != null)
{
// 保存当前编辑模式
var previousEditingMode = inkCanvas.EditingMode;
UnselectElement(currentSelectedElement);
// 恢复编辑模式
inkCanvas.EditingMode = previousEditingMode;
currentSelectedElement = null;
}
}
Ink Canvas/MainWindow_cs/MW_BoardControls.cs
+20
View File
@@ -133,7 +133,11 @@ namespace Ink_Canvas
// 隐藏图片选择工具栏
if (currentSelectedElement != null)
{
// 保存当前编辑模式
var previousEditingMode = inkCanvas.EditingMode;
UnselectElement(currentSelectedElement);
// 恢复编辑模式
inkCanvas.EditingMode = previousEditingMode;
currentSelectedElement = null;
}
@@ -219,7 +223,11 @@ namespace Ink_Canvas
// 隐藏图片选择工具栏
if (currentSelectedElement != null)
{
// 保存当前编辑模式
var previousEditingMode = inkCanvas.EditingMode;
UnselectElement(currentSelectedElement);
// 恢复编辑模式
inkCanvas.EditingMode = previousEditingMode;
currentSelectedElement = null;
}
@@ -249,7 +257,11 @@ namespace Ink_Canvas
// 隐藏图片选择工具栏
if (currentSelectedElement != null)
{
// 保存当前编辑模式
var previousEditingMode = inkCanvas.EditingMode;
UnselectElement(currentSelectedElement);
// 恢复编辑模式
inkCanvas.EditingMode = previousEditingMode;
currentSelectedElement = null;
}
@@ -272,7 +284,11 @@ namespace Ink_Canvas
// 隐藏图片选择工具栏
if (currentSelectedElement != null)
{
// 保存当前编辑模式
var previousEditingMode = inkCanvas.EditingMode;
UnselectElement(currentSelectedElement);
// 恢复编辑模式
inkCanvas.EditingMode = previousEditingMode;
currentSelectedElement = null;
}
@@ -307,7 +323,11 @@ namespace Ink_Canvas
// 隐藏图片选择工具栏
if (currentSelectedElement != null)
{
// 保存当前编辑模式
var previousEditingMode = inkCanvas.EditingMode;
UnselectElement(currentSelectedElement);
// 恢复编辑模式
inkCanvas.EditingMode = previousEditingMode;
currentSelectedElement = null;
}
Ink Canvas/MainWindow_cs/MW_ElementsControls.cs
+12 -6
View File
@@ -110,7 +110,11 @@ namespace Ink_Canvas
// 取消之前选中的元素
if (currentSelectedElement != null && currentSelectedElement != element)
{
// 保存当前编辑模式
var previousEditingMode = inkCanvas.EditingMode;
UnselectElement(currentSelectedElement);
// 恢复编辑模式
inkCanvas.EditingMode = previousEditingMode;
}
// 选中当前元素
@@ -323,11 +327,7 @@ namespace Ink_Canvas
GridInkCanvasSelectionCover.Visibility = Visibility.Collapsed;
}
// 恢复InkCanvas的编辑模式
if (inkCanvas != null)
{
inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
}
}
// 应用矩阵变换到元素
@@ -1179,6 +1179,9 @@ namespace Ink_Canvas
{
if (currentSelectedElement != null)
{
// 保存删除前的编辑模式
var previousEditingMode = inkCanvas.EditingMode;
// 记录删除历史
timeMachine.CommitElementRemoveHistory(currentSelectedElement);
@@ -1189,7 +1192,10 @@ namespace Ink_Canvas
UnselectElement(currentSelectedElement);
currentSelectedElement = null;
LogHelper.WriteLogToFile($"图片删除完成");
// 恢复到删除前的编辑模式
inkCanvas.EditingMode = previousEditingMode;
LogHelper.WriteLogToFile($"图片删除完成，已恢复到编辑模式: {previousEditingMode}");
}
}
catch (Exception ex)
Ink Canvas/MainWindow_cs/MW_PageListView.cs
+8
View File
@@ -89,7 +89,11 @@ namespace Ink_Canvas
// 隐藏图片选择工具栏
if (currentSelectedElement != null)
{
// 保存当前编辑模式
var previousEditingMode = inkCanvas.EditingMode;
UnselectElement(currentSelectedElement);
// 恢复编辑模式
inkCanvas.EditingMode = previousEditingMode;
currentSelectedElement = null;
}
@@ -118,7 +122,11 @@ namespace Ink_Canvas
// 隐藏图片选择工具栏
if (currentSelectedElement != null)
{
// 保存当前编辑模式
var previousEditingMode = inkCanvas.EditingMode;
UnselectElement(currentSelectedElement);
// 恢复编辑模式
inkCanvas.EditingMode = previousEditingMode;
currentSelectedElement = null;
}