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
2026-02-22 19:12:59 +08:00
parent 8155aac25d
commit 73a4a044ee
2 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
+7 -7
View File
@@ -838,7 +838,7 @@ namespace Ink_Canvas
_pptUIManager?.UpdateNavigationPanelsVisibility(); _pptUIManager?.UpdateNavigationPanelsVisibility();
if (Settings.Automation.IsAutoSaveStrokesAtClear && if (Settings.Automation.IsAutoSaveStrokesAtClear &&
inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber) SaveScreenShot(true); inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber) CaptureAndEnqueueScreenshotSave(true);
if (BtnPPTSlideShowEnd.Visibility == Visibility.Collapsed) if (BtnPPTSlideShowEnd.Visibility == Visibility.Collapsed)
new Thread(() => new Thread(() =>
@@ -969,10 +969,10 @@ namespace Ink_Canvas
{ {
var currentSlide = _pptManager?.GetCurrentSlideNumber() ?? 0; var currentSlide = _pptManager?.GetCurrentSlideNumber() ?? 0;
var presentationName = _pptManager?.GetPresentationName() ?? ""; var presentationName = _pptManager?.GetPresentationName() ?? "";
SaveScreenShot(true, $"{presentationName}/{currentSlide}_{DateTime.Now:HH-mm-ss}"); CaptureAndEnqueueScreenshotSave(true, $"{presentationName}/{currentSlide}_{DateTime.Now:HH-mm-ss}");
} }
else else
SaveScreenShot(true); CaptureAndEnqueueScreenshotSave(true);
} }
BtnClear_Click(null, null); BtnClear_Click(null, null);
@@ -2165,9 +2165,9 @@ namespace Ink_Canvas
{ {
var currentSlide = _pptManager?.GetCurrentSlideNumber() ?? 0; var currentSlide = _pptManager?.GetCurrentSlideNumber() ?? 0;
var presentationName = _pptManager?.GetPresentationName() ?? ""; var presentationName = _pptManager?.GetPresentationName() ?? "";
SaveScreenShot(true, $"{presentationName}/{currentSlide}_{DateTime.Now:HH-mm-ss}"); CaptureAndEnqueueScreenshotSave(true, $"{presentationName}/{currentSlide}_{DateTime.Now:HH-mm-ss}");
} }
else SaveScreenShot(true); else CaptureAndEnqueueScreenshotSave(true);
} }
if (BtnPPTSlideShowEnd.Visibility != Visibility.Visible) if (BtnPPTSlideShowEnd.Visibility != Visibility.Visible)
@@ -3627,7 +3627,7 @@ namespace Ink_Canvas
{ {
if (Settings.Automation.IsAutoSaveStrokesAtClear && inkCanvas.Strokes.Count > if (Settings.Automation.IsAutoSaveStrokesAtClear && inkCanvas.Strokes.Count >
Settings.Automation.MinimumAutomationStrokeNumber) Settings.Automation.MinimumAutomationStrokeNumber)
SaveScreenShot(true); CaptureAndEnqueueScreenshotSave(true);
//BtnClear_Click(null, null); //BtnClear_Click(null, null);
} }
@@ -3643,7 +3643,7 @@ namespace Ink_Canvas
{ {
if (Settings.Automation.IsAutoSaveStrokesAtClear && inkCanvas.Strokes.Count > if (Settings.Automation.IsAutoSaveStrokesAtClear && inkCanvas.Strokes.Count >
Settings.Automation.MinimumAutomationStrokeNumber) Settings.Automation.MinimumAutomationStrokeNumber)
SaveScreenShot(true); CaptureAndEnqueueScreenshotSave(true);
//BtnClear_Click(null, null); //BtnClear_Click(null, null);
} }
Ink Canvas/MainWindow_cs/MW_PPT.cs
+20 -18
View File
@@ -1947,19 +1947,20 @@ namespace Ink_Canvas
bool needScreenshot = strokeCount > Settings.Automation.MinimumAutomationStrokeNumber && bool needScreenshot = strokeCount > Settings.Automation.MinimumAutomationStrokeNumber &&
Settings.PowerPointSettings.IsAutoSaveScreenShotInPowerPoint; Settings.PowerPointSettings.IsAutoSaveScreenShotInPowerPoint;
if (needScreenshot)
{
var currentSlide = _pptManager?.GetCurrentSlideNumber() ?? 0;
if (currentSlide > 0)
{
var presentationName = _pptManager?.GetPresentationName() ?? "";
CaptureAndEnqueueScreenshotSave(true, $"{presentationName}/{currentSlide}");
}
}
Task.Run(() => Task.Run(() =>
{ {
try try
{ {
if (needScreenshot)
{
var currentSlide = _pptManager?.GetCurrentSlideNumber() ?? 0;
if (currentSlide > 0)
{
var presentationName = _pptManager?.GetPresentationName() ?? "";
Application.Current.Dispatcher.BeginInvoke(new Action(() => SaveScreenShot(true, $"{presentationName}/{currentSlide}")));
}
}
return _pptManager?.TryNavigatePrevious() ?? false; return _pptManager?.TryNavigatePrevious() ?? false;
} }
catch (Exception ex) catch (Exception ex)
@@ -1997,19 +1998,20 @@ namespace Ink_Canvas
bool needScreenshot = strokeCount > Settings.Automation.MinimumAutomationStrokeNumber && bool needScreenshot = strokeCount > Settings.Automation.MinimumAutomationStrokeNumber &&
Settings.PowerPointSettings.IsAutoSaveScreenShotInPowerPoint; Settings.PowerPointSettings.IsAutoSaveScreenShotInPowerPoint;
if (needScreenshot)
{
var currentSlide = _pptManager?.GetCurrentSlideNumber() ?? 0;
if (currentSlide > 0)
{
var presentationName = _pptManager?.GetPresentationName() ?? "";
CaptureAndEnqueueScreenshotSave(true, $"{presentationName}/{currentSlide}");
}
}
Task.Run(() => Task.Run(() =>
{ {
try try
{ {
if (needScreenshot)
{
var currentSlide = _pptManager?.GetCurrentSlideNumber() ?? 0;
if (currentSlide > 0)
{
var presentationName = _pptManager?.GetPresentationName() ?? "";
Application.Current.Dispatcher.BeginInvoke(new Action(() => SaveScreenShot(true, $"{presentationName}/{currentSlide}")));
}
}
return _pptManager?.TryNavigateNext() ?? false; return _pptManager?.TryNavigateNext() ?? false;
} }
catch (Exception ex) catch (Exception ex)