diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs index 6c11b03a7f..cfe97bbfba 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs @@ -189,7 +189,7 @@ namespace BizHawk.Client.EmuHawk } } - public bool EditMarkerPopUp(TasMovieMarker marker) + public void EditMarkerPopUp(TasMovieMarker marker) { var markerFrame = marker.Frame; InputPrompt i = new InputPrompt @@ -209,9 +209,7 @@ namespace BizHawk.Client.EmuHawk { marker.Message = i.PromptText; UpdateValues(); - return true; } - return false; } public void UpdateValues() diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/ScreenshotPopupControl.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/ScreenshotPopupControl.cs index 10310b0f39..877da461a3 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/ScreenshotPopupControl.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/ScreenshotPopupControl.cs @@ -19,7 +19,7 @@ namespace BizHawk.Client.EmuHawk public ScreenshotPopupControl() { - SetStyle(ControlStyles.SupportsTransparentBackColor, true); + //SetStyle(ControlStyles.SupportsTransparentBackColor, true); //SetStyle(ControlStyles.Opaque, true); //this.BackColor = Color.Transparent; @@ -28,6 +28,7 @@ namespace BizHawk.Client.EmuHawk protected override void OnPaint(PaintEventArgs e) { + Branch.OSDFrameBuffer.DiscardAlpha(); var bitmap = Branch.OSDFrameBuffer.ToSysdrawingBitmap(); e.Graphics.DrawImage(bitmap, new Rectangle(0, 0, Width, DrawingHeight)); if (UserPadding > 0)