ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Wire up `ScreenshotForm` for the quickslot buttons in the status bar

This commit is contained in:
James Groom 2024-04-05 00:14:21 +00:00 committed by GitHub
parent 20ff7a10ba
commit 1db54108ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/BizHawk.Client.Common/savestates/SavestateFile.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using BizHawk.Bizware.BizwareGL;
using BizHawk.Common;
using BizHawk.Emulation.Common;
@ -13,6 +14,15 @@ namespace BizHawk.Client.Common
/// </summary>
public class SavestateFile
{
public static BitmapBuffer/*?*/ GetFrameBufferFrom(string path)
{
using var bl = ZipStateLoader.LoadAndDetect(path);
if (bl is null) return null;
IVideoProvider/*?*/ vp = null;
bl.GetLump(BinaryStateLump.Framebuffer, abort: false, br => QuickBmpFile.LoadAuto(br.BaseStream, out vp));
return vp is null ? null : new(width: vp.BufferWidth, height: vp.BufferHeight, vp.GetVideoBuffer());
}
private readonly IEmulator _emulator;
private readonly IStatable _statable;
private readonly IVideoProvider _videoProvider;

37
src/BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -2472,6 +2472,43 @@ namespace BizHawk.Client.EmuHawk
}
}
private readonly ScreenshotForm _screenshotTooltip = new();
private void SlotStatusButtons_MouseEnter(object/*?*/ sender, EventArgs e)
{
var slot = 10;
if (sender == Slot1StatusButton) slot = 1;
else if (sender == Slot2StatusButton) slot = 2;
else if (sender == Slot3StatusButton) slot = 3;
else if (sender == Slot4StatusButton) slot = 4;
else if (sender == Slot5StatusButton) slot = 5;
else if (sender == Slot6StatusButton) slot = 6;
else if (sender == Slot7StatusButton) slot = 7;
else if (sender == Slot8StatusButton) slot = 8;
else if (sender == Slot9StatusButton) slot = 9;
//TODO just put the slot number in Control.Tag already
if (!(HasSlot(slot) && ReadScreenshotFromSavestate(slot: slot) is {} bb))
{
_screenshotTooltip.FadeOut();
return;
}
var width = bb.Width;
var height = bb.Height;
var location = PointToScreen(MainStatusBar.Location);
location.Offset(((e as MouseEventArgs)?.X ?? 50) - width/2, -height);
_screenshotTooltip.UpdateValues(
bb,
captionText: string.Empty,
location,
width: width,
height: height,
Graphics.FromHwnd(Handle).MeasureString);
_screenshotTooltip.FadeIn();
}
private void SlotStatusButtons_MouseLeave(object/*?*/ sender, EventArgs e)
=> _screenshotTooltip.FadeOut();
private void SlotStatusButtons_MouseUp(object sender, MouseEventArgs e)
{
var slot = 10;

17
src/BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -195,6 +195,18 @@ namespace BizHawk.Client.EmuHawk
SetStatusBar();
_stateSlots.Update(Emulator, MovieSession.Movie, SaveStatePrefix());
var quickslotButtons = new[]
{
Slot1StatusButton, Slot2StatusButton, Slot3StatusButton, Slot4StatusButton, Slot5StatusButton,
Slot6StatusButton, Slot7StatusButton, Slot8StatusButton, Slot9StatusButton, Slot0StatusButton,
};
for (var i = 0; i < quickslotButtons.Length; i++)
{
ref var button = ref quickslotButtons[i];
button.MouseEnter += SlotStatusButtons_MouseEnter;
button.MouseLeave += SlotStatusButtons_MouseLeave;
}
// New version notification
UpdateChecker.CheckComplete += (s2, e2) =>
{
@ -4235,6 +4247,11 @@ namespace BizHawk.Client.EmuHawk
return int.Parse(slot.Substring(slot.Length - 1, 1));
}
public BitmapBuffer/*?*/ ReadScreenshotFromSavestate(int slot)
=> Emulator.HasSavestates()
? SavestateFile.GetFrameBufferFrom($"{SaveStatePrefix()}.QuickSave{slot % 10}.State")
: null;
public bool LoadState(string path, string userFriendlyStateName, bool suppressOSD = false) // Move to client.common
{
if (!Emulator.HasSavestates()) return false;