Merge 6f76b7a8d3
into 0cdfec89b3
This commit is contained in:
commit
c255073a3f
|
@ -1181,6 +1181,7 @@ namespace BizHawk.Client.EmuHawk
|
||||||
this.MinimumSize = new System.Drawing.Size(200, 148);
|
this.MinimumSize = new System.Drawing.Size(200, 148);
|
||||||
this.Name = "TAStudio";
|
this.Name = "TAStudio";
|
||||||
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
|
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
|
||||||
|
this.Activated += new System.EventHandler(this.TAStudio_Activated);
|
||||||
this.Deactivate += new System.EventHandler(this.TAStudio_Deactivate);
|
this.Deactivate += new System.EventHandler(this.TAStudio_Deactivate);
|
||||||
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Tastudio_Closing);
|
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Tastudio_Closing);
|
||||||
this.Load += new System.EventHandler(this.Tastudio_Load);
|
this.Load += new System.EventHandler(this.Tastudio_Load);
|
||||||
|
|
|
@ -972,6 +972,13 @@ namespace BizHawk.Client.EmuHawk
|
||||||
toolTip1.SetToolTip(TasView, null);
|
toolTip1.SetToolTip(TasView, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void TAStudio_Activated(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
// The copy/paste shortcut keys are handled by the right-click context menu, not EmuHawk hotkeys.
|
||||||
|
// So they will only work if TasView is focused.
|
||||||
|
TasView.Select();
|
||||||
|
}
|
||||||
|
|
||||||
private void TAStudio_Deactivate(object sender, EventArgs e)
|
private void TAStudio_Deactivate(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
if (_leftButtonHeld)
|
if (_leftButtonHeld)
|
||||||
|
|
Loading…
Reference in New Issue