h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-27 11:03:22 +08:00
Code Issues Releases Wiki Activity

Fix mouse cursor potentially disappearing for good if screenshot capture fails

Browse Source
This commit is contained in:
Dean Herbert 2023-06-01 15:50:10 +09:00
parent bbc5b86077
commit 0a7d5a51d4
1 changed files with 60 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
osu.Game/Graphics/ScreenshotManager.cs
View File

@ -86,70 +86,75 @@ namespace osu.Game.Graphics
{ {
Interlocked.Increment(ref screenShotTasks); Interlocked.Increment(ref screenShotTasks);
if (!captureMenuCursor.Value) try
{ {
cursorVisibility.Value = false; if (!captureMenuCursor.Value)
// We need to wait for at most 3 draw nodes to be drawn, following which we can be assured at least one DrawNode has been generated/drawn with the set value
const int frames_to_wait = 3;
int framesWaited = 0;
using (var framesWaitedEvent = new ManualResetEventSlim(false))
{ {
ScheduledDelegate waitDelegate = host.DrawThread.Scheduler.AddDelayed(() => cursorVisibility.Value = false;
// We need to wait for at most 3 draw nodes to be drawn, following which we can be assured at least one DrawNode has been generated/drawn with the set value
const int frames_to_wait = 3;
int framesWaited = 0;
using (var framesWaitedEvent = new ManualResetEventSlim(false))
{ {
if (framesWaited++ >= frames_to_wait) ScheduledDelegate waitDelegate = host.DrawThread.Scheduler.AddDelayed(() =>
// ReSharper disable once AccessToDisposedClosure {
framesWaitedEvent.Set(); if (framesWaited++ >= frames_to_wait)
}, 10, true); // ReSharper disable once AccessToDisposedClosure
framesWaitedEvent.Set();
}, 10, true);
if (!framesWaitedEvent.Wait(1000)) if (!framesWaitedEvent.Wait(1000))
throw new TimeoutException("Screenshot data did not arrive in a timely fashion"); throw new TimeoutException("Screenshot data did not arrive in a timely fashion");
waitDelegate.Cancel(); waitDelegate.Cancel();
}
}
using (var image = await host.TakeScreenshotAsync().ConfigureAwait(false))
{
host.GetClipboard()?.SetImage(image);
(string filename, var stream) = getWritableStream();
if (filename == null) return;
using (stream)
{
switch (screenshotFormat.Value)
{
case ScreenshotFormat.Png:
await image.SaveAsPngAsync(stream).ConfigureAwait(false);
break;
case ScreenshotFormat.Jpg:
const int jpeg_quality = 92;
await image.SaveAsJpegAsync(stream, new JpegEncoder { Quality = jpeg_quality }).ConfigureAwait(false);
break;
default:
throw new InvalidOperationException($"Unknown enum member {nameof(ScreenshotFormat)} {screenshotFormat.Value}.");
}
}
notificationOverlay.Post(new SimpleNotification
{
Text = $"Screenshot {filename} saved!",
Activated = () =>
{
storage.PresentFileExternally(filename);
return true;
}
});
} }
} }
finally
using (var image = await host.TakeScreenshotAsync().ConfigureAwait(false))
{ {
if (Interlocked.Decrement(ref screenShotTasks) == 0 && cursorVisibility.Value == false) if (Interlocked.Decrement(ref screenShotTasks) == 0)
cursorVisibility.Value = true; cursorVisibility.Value = true;
host.GetClipboard()?.SetImage(image);
(string filename, var stream) = getWritableStream();
if (filename == null) return;
using (stream)
{
switch (screenshotFormat.Value)
{
case ScreenshotFormat.Png:
await image.SaveAsPngAsync(stream).ConfigureAwait(false);
break;
case ScreenshotFormat.Jpg:
const int jpeg_quality = 92;
await image.SaveAsJpegAsync(stream, new JpegEncoder { Quality = jpeg_quality }).ConfigureAwait(false);
break;
default:
throw new InvalidOperationException($"Unknown enum member {nameof(ScreenshotFormat)} {screenshotFormat.Value}.");
}
}
notificationOverlay.Post(new SimpleNotification
{
Text = $"Screenshot {filename} saved!",
Activated = () =>
{
storage.PresentFileExternally(filename);
return true;
}
});
} }
}); });