From 91c12d06b6996373e4759605b1bd4974cb8b6d83 Mon Sep 17 00:00:00 2001 From: Suuper Date: Sat, 25 Jul 2015 20:15:35 -0500 Subject: [PATCH] TAStudio: -Show button name and frame of painted input in undo log. -Don't scroll to follow cursor while mouse button is held. --- BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs | 4 ++-- BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs index 25bd2fb8d4..aa935dfabd 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs @@ -361,7 +361,7 @@ namespace BizHawk.Client.EmuHawk { if (Global.MovieSession.MovieControllerAdapter.Type.BoolButtons.Contains(buttonName)) { - CurrentTasMovie.ChangeLog.BeginNewBatch("Paint Bool"); + CurrentTasMovie.ChangeLog.BeginNewBatch("Paint Bool " + buttonName + " from frame " + frame); CurrentTasMovie.ToggleBoolState(TasView.CurrentCell.RowIndex.Value, buttonName); _triggerAutoRestore = true; @@ -406,7 +406,7 @@ namespace BizHawk.Client.EmuHawk if (e.Clicks != 2) { - CurrentTasMovie.ChangeLog.BeginNewBatch("Paint Float"); + CurrentTasMovie.ChangeLog.BeginNewBatch("Paint Float " + buttonName + " from frame " + frame); _startFloatDrawColumn = buttonName; } else // Double-click enters float editing mode diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs index 4343a3b51b..88899f8814 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs @@ -115,7 +115,7 @@ namespace BizHawk.Client.EmuHawk private void MaybeFollowCursor() { - if (TasPlaybackBox.FollowCursor && !TasView.IsPaintDown) + if (TasPlaybackBox.FollowCursor && !mouseButtonHeld) SetVisibleIndex(); } }