From 2c7b2a530ce798ab01aa69297a56b4918390981e Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Fri, 27 Nov 2020 10:25:30 -0600
Subject: [PATCH] Remove GlobalWin usage in BmpView, and also use appropriate
 suffixes in various screenshot saving methods in various graphics tools

---
 src/BizHawk.Client.EmuHawk/config/GB/BmpView.cs    |  5 -----
 .../tools/GB/GBPrinterView.cs                      |  6 +++++-
 .../tools/PCE/PCETileViewer.cs                     | 12 ++++++++++--
 src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs  | 14 +++++++++++---
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/config/GB/BmpView.cs b/src/BizHawk.Client.EmuHawk/config/GB/BmpView.cs
index 13e1babcb0..c73bcfbc0e 100644
--- a/src/BizHawk.Client.EmuHawk/config/GB/BmpView.cs
+++ b/src/BizHawk.Client.EmuHawk/config/GB/BmpView.cs
@@ -96,10 +96,5 @@ namespace BizHawk.Client.EmuHawk
 			Bmp.UnlockBits(lockBits);
 			Refresh();
 		}
-
-		public void SaveFile()
-		{
-			Bmp.SaveAsFile(GlobalWin.Game, "Palettes", GlobalWin.Emulator.SystemId, GlobalWin.Config.PathEntries, this);
-		}
 	}
 }
diff --git a/src/BizHawk.Client.EmuHawk/tools/GB/GBPrinterView.cs b/src/BizHawk.Client.EmuHawk/tools/GB/GBPrinterView.cs
index 2cd8db501d..b5fe448d4f 100644
--- a/src/BizHawk.Client.EmuHawk/tools/GB/GBPrinterView.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/GB/GBPrinterView.cs
@@ -21,6 +21,9 @@ namespace BizHawk.Client.EmuHawk
 		[RequiredService]
 		public IGameboyCommon Gb { get; private set; }
 
+		[RequiredService]
+		public IEmulator Emulator { get; set; }
+
 		// If we've connected the printer yet
 		private bool _connected;
 
@@ -183,7 +186,8 @@ namespace BizHawk.Client.EmuHawk
 				g.DrawImage(_printerHistory, Point.Empty);
 				g.Flush();
 			}
-			toSave.SaveFile();
+
+			toSave.Bmp.SaveAsFile(Game, "Print", Emulator.SystemId, Config.PathEntries, this);
 		}
 
 		private void copyToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs b/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs
index bfd6342d32..9ccb6b6a95 100644
--- a/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs
@@ -16,6 +16,9 @@ namespace BizHawk.Client.EmuHawk
 		[RequiredService]
 		public IPceGpuView Viewer { get; private set; }
 
+		[RequiredService]
+		public IEmulator Emulator { get; set; }
+
 		private int _bgPalNum;
 		private int _spPalNum;
 
@@ -200,14 +203,19 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
+		private void SaveAsFile(Bitmap bmp, string suffix)
+		{
+			bmp.SaveAsFile(Game, suffix, Emulator.SystemId, Config.PathEntries, this);
+		}
+
 		private void SaveBackgroundScreenshotMenuItem_Click(object sender, EventArgs e)
 		{
-			bmpViewBG.SaveFile();
+			SaveAsFile(bmpViewBG.Bmp, "BG");
 		}
 
 		private void SaveSpriteScreenshotMenuItem_Click(object sender, EventArgs e)
 		{
-			bmpViewSP.SaveFile();
+			SaveAsFile(bmpViewBG.Bmp, "Sprites");
 		}
 	}
 }
diff --git a/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs b/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs
index e9616e1367..fe5044180e 100644
--- a/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs
@@ -15,6 +15,9 @@ namespace BizHawk.Client.EmuHawk
 		[RequiredService]
 		private ISmsGpuView Vdp { get; set; }
 
+		[RequiredService]
+		private IEmulator Emulator { get; set; }
+
 		private int _palIndex;
 
 		protected override string WindowTitleStatic => "VDP Viewer";
@@ -192,19 +195,24 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
+		private void SaveAsFile(Bitmap bmp, string suffix)
+		{
+			bmp.SaveAsFile(Game, suffix, Emulator.SystemId, Config.PathEntries, this);
+		}
+
 		private void saveTilesScreenshotToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			bmpViewTiles.SaveFile();
+			SaveAsFile(bmpViewTiles.Bmp, "Tiles");
 		}
 
 		private void SavePalettesScreenshotMenuItem_Click(object sender, EventArgs e)
 		{
-			bmpViewPalette.SaveFile();
+			SaveAsFile(bmpViewPalette.Bmp, "Palette");
 		}
 
 		private void SaveBgScreenshotMenuItem_Click(object sender, EventArgs e)
 		{
-			bmpViewBG.SaveFile();
+			SaveAsFile(bmpViewBG.Bmp, "BG");
 		}
 	}
 }