improve:图片插入
This commit is contained in:
@@ -1003,7 +1003,11 @@ namespace Ink_Canvas
|
|||||||
// 如果当前有选中的元素,取消选中状态
|
// 如果当前有选中的元素,取消选中状态
|
||||||
if (currentSelectedElement != null)
|
if (currentSelectedElement != null)
|
||||||
{
|
{
|
||||||
|
// 保存当前编辑模式
|
||||||
|
var previousEditingMode = inkCanvas.EditingMode;
|
||||||
UnselectElement(currentSelectedElement);
|
UnselectElement(currentSelectedElement);
|
||||||
|
// 恢复编辑模式
|
||||||
|
inkCanvas.EditingMode = previousEditingMode;
|
||||||
currentSelectedElement = null;
|
currentSelectedElement = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -133,7 +133,11 @@ namespace Ink_Canvas
|
|||||||
// 隐藏图片选择工具栏
|
// 隐藏图片选择工具栏
|
||||||
if (currentSelectedElement != null)
|
if (currentSelectedElement != null)
|
||||||
{
|
{
|
||||||
|
// 保存当前编辑模式
|
||||||
|
var previousEditingMode = inkCanvas.EditingMode;
|
||||||
UnselectElement(currentSelectedElement);
|
UnselectElement(currentSelectedElement);
|
||||||
|
// 恢复编辑模式
|
||||||
|
inkCanvas.EditingMode = previousEditingMode;
|
||||||
currentSelectedElement = null;
|
currentSelectedElement = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -219,7 +223,11 @@ namespace Ink_Canvas
|
|||||||
// 隐藏图片选择工具栏
|
// 隐藏图片选择工具栏
|
||||||
if (currentSelectedElement != null)
|
if (currentSelectedElement != null)
|
||||||
{
|
{
|
||||||
|
// 保存当前编辑模式
|
||||||
|
var previousEditingMode = inkCanvas.EditingMode;
|
||||||
UnselectElement(currentSelectedElement);
|
UnselectElement(currentSelectedElement);
|
||||||
|
// 恢复编辑模式
|
||||||
|
inkCanvas.EditingMode = previousEditingMode;
|
||||||
currentSelectedElement = null;
|
currentSelectedElement = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -249,7 +257,11 @@ namespace Ink_Canvas
|
|||||||
// 隐藏图片选择工具栏
|
// 隐藏图片选择工具栏
|
||||||
if (currentSelectedElement != null)
|
if (currentSelectedElement != null)
|
||||||
{
|
{
|
||||||
|
// 保存当前编辑模式
|
||||||
|
var previousEditingMode = inkCanvas.EditingMode;
|
||||||
UnselectElement(currentSelectedElement);
|
UnselectElement(currentSelectedElement);
|
||||||
|
// 恢复编辑模式
|
||||||
|
inkCanvas.EditingMode = previousEditingMode;
|
||||||
currentSelectedElement = null;
|
currentSelectedElement = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -272,7 +284,11 @@ namespace Ink_Canvas
|
|||||||
// 隐藏图片选择工具栏
|
// 隐藏图片选择工具栏
|
||||||
if (currentSelectedElement != null)
|
if (currentSelectedElement != null)
|
||||||
{
|
{
|
||||||
|
// 保存当前编辑模式
|
||||||
|
var previousEditingMode = inkCanvas.EditingMode;
|
||||||
UnselectElement(currentSelectedElement);
|
UnselectElement(currentSelectedElement);
|
||||||
|
// 恢复编辑模式
|
||||||
|
inkCanvas.EditingMode = previousEditingMode;
|
||||||
currentSelectedElement = null;
|
currentSelectedElement = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -307,7 +323,11 @@ namespace Ink_Canvas
|
|||||||
// 隐藏图片选择工具栏
|
// 隐藏图片选择工具栏
|
||||||
if (currentSelectedElement != null)
|
if (currentSelectedElement != null)
|
||||||
{
|
{
|
||||||
|
// 保存当前编辑模式
|
||||||
|
var previousEditingMode = inkCanvas.EditingMode;
|
||||||
UnselectElement(currentSelectedElement);
|
UnselectElement(currentSelectedElement);
|
||||||
|
// 恢复编辑模式
|
||||||
|
inkCanvas.EditingMode = previousEditingMode;
|
||||||
currentSelectedElement = null;
|
currentSelectedElement = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -110,7 +110,11 @@ namespace Ink_Canvas
|
|||||||
// 取消之前选中的元素
|
// 取消之前选中的元素
|
||||||
if (currentSelectedElement != null && currentSelectedElement != element)
|
if (currentSelectedElement != null && currentSelectedElement != element)
|
||||||
{
|
{
|
||||||
|
// 保存当前编辑模式
|
||||||
|
var previousEditingMode = inkCanvas.EditingMode;
|
||||||
UnselectElement(currentSelectedElement);
|
UnselectElement(currentSelectedElement);
|
||||||
|
// 恢复编辑模式
|
||||||
|
inkCanvas.EditingMode = previousEditingMode;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 选中当前元素
|
// 选中当前元素
|
||||||
@@ -323,11 +327,7 @@ namespace Ink_Canvas
|
|||||||
GridInkCanvasSelectionCover.Visibility = Visibility.Collapsed;
|
GridInkCanvasSelectionCover.Visibility = Visibility.Collapsed;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 恢复InkCanvas的编辑模式
|
|
||||||
if (inkCanvas != null)
|
|
||||||
{
|
|
||||||
inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 应用矩阵变换到元素
|
// 应用矩阵变换到元素
|
||||||
@@ -1179,6 +1179,9 @@ namespace Ink_Canvas
|
|||||||
{
|
{
|
||||||
if (currentSelectedElement != null)
|
if (currentSelectedElement != null)
|
||||||
{
|
{
|
||||||
|
// 保存删除前的编辑模式
|
||||||
|
var previousEditingMode = inkCanvas.EditingMode;
|
||||||
|
|
||||||
// 记录删除历史
|
// 记录删除历史
|
||||||
timeMachine.CommitElementRemoveHistory(currentSelectedElement);
|
timeMachine.CommitElementRemoveHistory(currentSelectedElement);
|
||||||
|
|
||||||
@@ -1189,7 +1192,10 @@ namespace Ink_Canvas
|
|||||||
UnselectElement(currentSelectedElement);
|
UnselectElement(currentSelectedElement);
|
||||||
currentSelectedElement = null;
|
currentSelectedElement = null;
|
||||||
|
|
||||||
LogHelper.WriteLogToFile($"图片删除完成");
|
// 恢复到删除前的编辑模式
|
||||||
|
inkCanvas.EditingMode = previousEditingMode;
|
||||||
|
|
||||||
|
LogHelper.WriteLogToFile($"图片删除完成,已恢复到编辑模式: {previousEditingMode}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
|
|||||||
@@ -89,7 +89,11 @@ namespace Ink_Canvas
|
|||||||
// 隐藏图片选择工具栏
|
// 隐藏图片选择工具栏
|
||||||
if (currentSelectedElement != null)
|
if (currentSelectedElement != null)
|
||||||
{
|
{
|
||||||
|
// 保存当前编辑模式
|
||||||
|
var previousEditingMode = inkCanvas.EditingMode;
|
||||||
UnselectElement(currentSelectedElement);
|
UnselectElement(currentSelectedElement);
|
||||||
|
// 恢复编辑模式
|
||||||
|
inkCanvas.EditingMode = previousEditingMode;
|
||||||
currentSelectedElement = null;
|
currentSelectedElement = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -118,7 +122,11 @@ namespace Ink_Canvas
|
|||||||
// 隐藏图片选择工具栏
|
// 隐藏图片选择工具栏
|
||||||
if (currentSelectedElement != null)
|
if (currentSelectedElement != null)
|
||||||
{
|
{
|
||||||
|
// 保存当前编辑模式
|
||||||
|
var previousEditingMode = inkCanvas.EditingMode;
|
||||||
UnselectElement(currentSelectedElement);
|
UnselectElement(currentSelectedElement);
|
||||||
|
// 恢复编辑模式
|
||||||
|
inkCanvas.EditingMode = previousEditingMode;
|
||||||
currentSelectedElement = null;
|
currentSelectedElement = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user