From a2edd3a018b3823fc2668cd36866b1a29bf1630e Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@expion.com>
Date: Sat, 25 Jul 2015 21:31:06 -0400
Subject: [PATCH] Tastudio - Branches - fix screenshot hover, and also set the
 screenshot hover size to a "1x" resolution for the given core

---
 BizHawk.Client.Common/movie/tasproj/TasBranch.cs         | 2 +-
 .../tools/TAStudio/BookmarksBranchesBox.cs               | 7 +++++--
 BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs        | 9 +++++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/BizHawk.Client.Common/movie/tasproj/TasBranch.cs b/BizHawk.Client.Common/movie/tasproj/TasBranch.cs
index 2ecfbd7106..303ae935f3 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasBranch.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasBranch.cs
@@ -45,7 +45,7 @@ namespace BizHawk.Client.Common
 				bs.PutLump(nframebuffer, delegate(Stream s)
 				{
 					var vp = new BitmapBufferVideoProvider(b.OSDFrameBuffer);
-					QuickBmpFile.Save(vp, s, b.OSDFrameBuffer.Width, b.OSDFrameBuffer.Height); // todo: choose size more smarterly
+					QuickBmpFile.Save(vp, s, b.OSDFrameBuffer.Width, b.OSDFrameBuffer.Height);
 				});
 				bs.PutLump(nlaglog, delegate(BinaryWriter bw)
 				{
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
index c9777331b6..372571bd6b 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
@@ -279,8 +279,11 @@ namespace BizHawk.Client.EmuHawk
 
 		private void ScreenShotPopUp(TasBranch branch, int index)
 		{
-			int x = this.Location.X - Tastudio.ScreenshotControl.Width;
-			int y = this.Location.Y + (BranchView.RowHeight * index);
+			Point locationOnForm = this.FindForm().PointToClient(
+				this.Parent.PointToScreen(this.Location));
+
+			int x = locationOnForm.X - Tastudio.ScreenshotControl.Width;
+			int y = locationOnForm.Y + (BranchView.RowHeight * index);
 
 			Tastudio.ScreenshotControl.Location = new Point(x, y);
 
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index 920fa65fd6..1c2feb91de 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -82,6 +82,15 @@ namespace BizHawk.Client.EmuHawk
 		public TAStudio()
 		{
 			InitializeComponent();
+
+			if (Global.Emulator != null)
+			{
+				// Set the screenshot to "1x" resolution of the core
+				// TODO: cores like n64 and psx are going to still have sizes too big for the control
+				// Find a smart way to keep them small
+				ScreenshotControl.Size = new Size(Global.Emulator.VideoProvider().BufferWidth, Global.Emulator.VideoProvider().BufferHeight);
+			}
+
 			ScreenshotControl.Visible = false;
 			Controls.Add(ScreenshotControl);
 			ScreenshotControl.BringToFront();