From 2d2efba150920212073f61c32a099b92a1dd9604 Mon Sep 17 00:00:00 2001 From: feos Date: Mon, 13 Jun 2016 18:29:29 +0300 Subject: [PATCH] tastudio: option to do autorestore not only on mouseup. doesn't affect rerecord counter --- .../tools/TAStudio/TAStudio.Designer.cs | 10 ++++++++++ .../tools/TAStudio/TAStudio.ListView.cs | 15 +++++++++++++++ .../tools/TAStudio/TAStudio.MenuItems.cs | 6 ++++++ BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs | 2 ++ 4 files changed, 33 insertions(+) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs index 94fc19a8c0..dcb25fd15a 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs @@ -92,6 +92,7 @@ namespace BizHawk.Client.EmuHawk this.AutosaveAsBackupFileMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.BackupPerFileSaveMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); + this.AutoRestoreOnMouseUpOnlyMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.AutoadjustInputMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.DrawInputByDraggingMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.applyPatternToPaintedInputToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -632,6 +633,7 @@ namespace BizHawk.Client.EmuHawk this.autosaveToolStripMenuItem, this.BackupPerFileSaveMenuItem, this.toolStripSeparator9, + this.AutoRestoreOnMouseUpOnlyMenuItem, this.AutoadjustInputMenuItem, this.DrawInputByDraggingMenuItem, this.applyPatternToPaintedInputToolStripMenuItem, @@ -722,6 +724,13 @@ namespace BizHawk.Client.EmuHawk this.toolStripSeparator9.Name = "toolStripSeparator9"; this.toolStripSeparator9.Size = new System.Drawing.Size(250, 6); // + // AutoRestoreOnMouseUpOnlyMenuItem + // + this.AutoRestoreOnMouseUpOnlyMenuItem.Name = "AutoRestoreOnMouseUpOnlyMenuItem"; + this.AutoRestoreOnMouseUpOnlyMenuItem.Size = new System.Drawing.Size(253, 22); + this.AutoRestoreOnMouseUpOnlyMenuItem.Text = "Auto-restore on Mouse Up only"; + this.AutoRestoreOnMouseUpOnlyMenuItem.Click += new System.EventHandler(this.AutoRestoreOnMouseUpOnlyMenuItem_Click); + // // AutoadjustInputMenuItem // this.AutoadjustInputMenuItem.CheckOnClick = true; @@ -1792,5 +1801,6 @@ namespace BizHawk.Client.EmuHawk private System.Windows.Forms.ToolStripMenuItem BackupPerFileSaveMenuItem; private System.Windows.Forms.ToolStripMenuItem SaveBackupMenuItem; private System.Windows.Forms.ToolStripMenuItem SaveBk2BackupMenuItem; + private System.Windows.Forms.ToolStripMenuItem AutoRestoreOnMouseUpOnlyMenuItem; } } \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs index b3e40d587d..14160e6871 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs @@ -474,6 +474,9 @@ namespace BizHawk.Client.EmuHawk } else _patternPaint = false; + + if (!Settings.AutoRestoreOnMouseUpOnly) + DoTriggeredAutoRestoreIfNeeded(); } else { @@ -830,6 +833,12 @@ namespace BizHawk.Client.EmuHawk CurrentTasMovie.SetBoolState(i, _startBoolDrawColumn, setVal); // Notice it uses new row, old column, you can only paint across a single column JumpToGreenzone(); } + + if (!Settings.AutoRestoreOnMouseUpOnly) + { + _triggerAutoRestore = true; + DoTriggeredAutoRestoreIfNeeded(); + } } } @@ -852,6 +861,12 @@ namespace BizHawk.Client.EmuHawk CurrentTasMovie.SetFloatState(i, _startFloatDrawColumn, setVal); // Notice it uses new row, old column, you can only paint across a single column JumpToGreenzone(); } + + if (!Settings.AutoRestoreOnMouseUpOnly) + { + _triggerAutoRestore = true; + DoTriggeredAutoRestoreIfNeeded(); + } } } diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs index ac2fff1e5e..72d73da5ab 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs @@ -747,6 +747,7 @@ namespace BizHawk.Client.EmuHawk { DrawInputByDraggingMenuItem.Checked = Settings.DrawInput; AutopauseAtEndOfMovieMenuItem.Checked = Settings.AutoPause; + AutoRestoreOnMouseUpOnlyMenuItem.Checked = Settings.AutoRestoreOnMouseUpOnly; EmptyNewMarkerNotesMenuItem.Checked = Settings.EmptyMarkers; AutosaveAsBk2MenuItem.Checked = Settings.AutosaveAsBk2; AutosaveAsBackupFileMenuItem.Checked = Settings.AutosaveAsBackupFile; @@ -879,6 +880,11 @@ namespace BizHawk.Client.EmuHawk Settings.AutoPause ^= true; } + private void AutoRestoreOnMouseUpOnlyMenuItem_Click(object sender, EventArgs e) + { + Settings.AutoRestoreOnMouseUpOnly ^= true; + } + private void autoHoldToolStripMenuItem_CheckedChanged(object sender, EventArgs e) { if (autoHoldToolStripMenuItem.Checked) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index 6bb5be42db..d34889c154 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -68,6 +68,7 @@ namespace BizHawk.Client.EmuHawk FollowCursorScrollMethod = "near"; BranchCellHoverInterval = 1; SeekingCutoffInterval = 2; // unused, relying on VisibleRows is smarter + AutoRestoreOnMouseUpOnly = true; AutosaveInterval = 120000; AutosaveAsBk2 = false; AutosaveAsBackupFile = false; @@ -90,6 +91,7 @@ namespace BizHawk.Client.EmuHawk public string FollowCursorScrollMethod { get; set; } public int BranchCellHoverInterval { get; set; } public int SeekingCutoffInterval { get; set; } + public bool AutoRestoreOnMouseUpOnly { get; set; } public uint AutosaveInterval { get; set; } public bool AutosaveAsBk2 { get; set; } public bool AutosaveAsBackupFile { get; set; }