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

improve:PPT墨迹加载

Browse Source
This commit is contained in:
CJKmkp
2025-12-13 20:13:08 +08:00
parent 3cd26323dc
commit e792f2637d
1 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/MainWindow_cs/MW_PPT.cs
+37 -33
View File
@@ -835,49 +835,53 @@ namespace Ink_Canvas
var previousSlide = _currentSlideShowPosition > 0 ? _currentSlideShowPosition : var previousSlide = _currentSlideShowPosition > 0 ? _currentSlideShowPosition :
(_pptManager?.GetCurrentSlideNumber() ?? 0); (_pptManager?.GetCurrentSlideNumber() ?? 0);
// 先保存当前页墨迹的副本
StrokeCollection strokesToSave = null;
if (previousSlide > 0 && previousSlide != currentSlide && inkCanvas.Strokes.Count > 0)
{
strokesToSave = inkCanvas.Strokes.Clone();
}
if (_isInkClearedByButton) if (_isInkClearedByButton)
{ {
_isInkClearedByButton = false; _isInkClearedByButton = false;
} }
else if (inkCanvas.Strokes.Count > 0) else
{ {
ClearStrokes(true); StrokeCollection strokesToSave = null;
timeMachine.ClearStrokeHistory(); if (previousSlide > 0 && previousSlide != currentSlide && inkCanvas.Strokes.Count > 0)
{
strokesToSave = inkCanvas.Strokes.Clone();
}
// 清除墨迹
if (inkCanvas.Strokes.Count > 0)
{
ClearStrokes(true);
timeMachine.ClearStrokeHistory();
}
// 异步保存之前页面的墨迹
if (strokesToSave != null && previousSlide > 0 && previousSlide != currentSlide)
{
Task.Run(() =>
{
try
{
Application.Current.Dispatcher.Invoke(() =>
{
bool canWrite = _singlePPTInkManager?.CanWriteInk(previousSlide) == true;
if (canWrite)
{
_singlePPTInkManager?.SaveCurrentSlideStrokes(previousSlide, strokesToSave);
}
});
}
catch (Exception ex)
{
LogHelper.WriteLogToFile($"异步保存PPT页面墨迹失败: {ex}", LogHelper.LogType.Error);
}
});
}
} }
// 更新当前播放页码 // 更新当前播放页码
_currentSlideShowPosition = currentSlide; _currentSlideShowPosition = currentSlide;
// 异步保存之前页面的墨迹（不阻塞翻页操作） LoadCurrentSlideInk(currentSlide, skipClear: true);
if (strokesToSave != null && previousSlide > 0 && previousSlide != currentSlide)
{
Task.Run(() =>
{
try
{
Application.Current.Dispatcher.Invoke(() =>
{
bool canWrite = _singlePPTInkManager?.CanWriteInk(previousSlide) == true;
if (canWrite)
{
_singlePPTInkManager?.SaveCurrentSlideStrokes(previousSlide, strokesToSave);
}
});
}
catch (Exception ex)
{
LogHelper.WriteLogToFile($"异步保存PPT页面墨迹失败: {ex}", LogHelper.LogType.Error);
}
});
}
LoadCurrentSlideInk(currentSlide, skipClear: true); // 跳过清除，因为已在上面清除
_pptUIManager?.UpdateCurrentSlideNumber(currentSlide, totalSlides); _pptUIManager?.UpdateCurrentSlideNumber(currentSlide, totalSlides);
}); });