From d074880242e32a7a731e515dd72ed7f752100f34 Mon Sep 17 00:00:00 2001 From: vadosnaprimer Date: Wed, 10 Jan 2018 22:06:10 +0300 Subject: [PATCH] tastudio: MarkerView.ShrinkSelection() --- .../tools/TAStudio/MarkerControl.cs | 20 ++++++++++++++++++- .../tools/TAStudio/TAStudio.MenuItems.cs | 2 +- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs index 3b96042ccb..1839791384 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs @@ -150,11 +150,28 @@ namespace BizHawk.Client.EmuHawk if (MarkerView.AnyRowsSelected) { SelectedMarkers.ForEach(i => Markers.Remove(i)); + ShrinkSelection(); Tastudio.RefreshDialog(); MarkerView_SelectedIndexChanged(null, null); } } + // feos: not the same as InputRoll.TruncateSelection(), since multiple selection of markers is forbidden + // moreover, when the last marker is removed, we need its selection to move to the previous marker + // still iterate, so things don't break if multiple selection is allowed someday + public void ShrinkSelection() + { + if (MarkerView.AnyRowsSelected) + { + while (MarkerView.SelectedRows.Last() > Markers.Count() - 1) + { + MarkerView.SelectRow(Markers.Count(), false); + MarkerView.SelectRow(Markers.Count() - 1, true); + } + } + + } + public void AddMarker(bool editText = false, int? frame = null) { // feos: we specify the selected frame if we call this from TasView, otherwise marker should be added to the emulated frame @@ -252,7 +269,8 @@ namespace BizHawk.Client.EmuHawk { get { - return MarkerView.SelectedRows + return MarkerView + .SelectedRows .Select(index => Markers[index]) .ToList(); } diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs index 63be9aa051..e1ef5b53a2 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs @@ -742,7 +742,7 @@ namespace BizHawk.Client.EmuHawk { CurrentTasMovie.Markers.Remove(m); } - + MarkerControl.ShrinkSelection(); RefreshDialog(); }