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
2026-02-20 13:23:20 +08:00
parent d032293a0d
commit 8292b2ef25
1 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/MainWindow_cs/MW_PPT.cs
+36 -15
View File
@@ -96,6 +96,8 @@ namespace Ink_Canvas
// 当前播放页码跟踪 // 当前播放页码跟踪
private int _currentSlideShowPosition = 0; private int _currentSlideShowPosition = 0;
private readonly object _slideSwitchLock = new object();
private bool _isProcessingSlideSwitch = false;
private DispatcherTimer _exitPPTModeAfterDisconnectTimer; private DispatcherTimer _exitPPTModeAfterDisconnectTimer;
private const int ExitPPTModeAfterDisconnectDelayMs = 1200; private const int ExitPPTModeAfterDisconnectDelayMs = 1200;
@@ -887,31 +889,46 @@ namespace Ink_Canvas
int currentSlide = wn.View.CurrentShowPosition; int currentSlide = wn.View.CurrentShowPosition;
int totalSlides = wn.Presentation.Slides.Count; int totalSlides = wn.Presentation.Slides.Count;
if (currentSlide == _currentSlideShowPosition) return; lock (_slideSwitchLock)
Application.Current.Dispatcher.Invoke(() =>
{ {
if (currentSlide == _currentSlideShowPosition) return;
if (_isProcessingSlideSwitch) return;
_isProcessingSlideSwitch = true;
int prev = _currentSlideShowPosition; int prev = _currentSlideShowPosition;
if (inkCanvas.Strokes.Count > 0 && prev > 0 && prev != currentSlide) Application.Current.Dispatcher.Invoke(() =>
_singlePPTInkManager?.SaveCurrentSlideStrokes(prev, inkCanvas.Strokes); {
try
{
if (inkCanvas.Strokes.Count > 0 && prev > 0 && prev != currentSlide)
_singlePPTInkManager?.SaveCurrentSlideStrokes(prev, inkCanvas.Strokes);
ClearStrokes(true); ClearStrokes(true);
timeMachine.ClearStrokeHistory(); timeMachine.ClearStrokeHistory();
StrokeCollection newStrokes = _singlePPTInkManager?.LoadSlideStrokes(currentSlide); StrokeCollection newStrokes = _singlePPTInkManager?.LoadSlideStrokes(currentSlide);
if (newStrokes != null && newStrokes.Count > 0) if (newStrokes != null && newStrokes.Count > 0)
inkCanvas.Strokes.Add(newStrokes); inkCanvas.Strokes.Add(newStrokes);
_singlePPTInkManager?.LockInkForSlide(currentSlide); _singlePPTInkManager?.LockInkForSlide(currentSlide);
_pptUIManager?.UpdateCurrentSlideNumber(currentSlide, totalSlides); _pptUIManager?.UpdateCurrentSlideNumber(currentSlide, totalSlides);
}); }
finally
_currentSlideShowPosition = currentSlide; {
_currentSlideShowPosition = currentSlide;
_isProcessingSlideSwitch = false;
}
});
}
} }
catch (Exception ex) catch (Exception ex)
{ {
LogHelper.WriteLogToFile($"处理幻灯片切换事件失败: {ex}", LogHelper.LogType.Error); LogHelper.WriteLogToFile($"处理幻灯片切换事件失败: {ex}", LogHelper.LogType.Error);
lock (_slideSwitchLock)
{
_isProcessingSlideSwitch = false;
}
} }
} }
@@ -1280,6 +1297,10 @@ namespace Ink_Canvas
// 重置当前播放页码跟踪 // 重置当前播放页码跟踪
_currentSlideShowPosition = 0; _currentSlideShowPosition = 0;
lock (_slideSwitchLock)
{
_isProcessingSlideSwitch = false;
}
LogHelper.WriteLogToFile("PPT状态变量已重置", LogHelper.LogType.Trace); LogHelper.WriteLogToFile("PPT状态变量已重置", LogHelper.LogType.Trace);