From 0d72cd901a055bb9327e53d5ebd836654ed44983 Mon Sep 17 00:00:00 2001 From: RetroEdit <30182911+RetroEdit@users.noreply.github.com> Date: Fri, 18 Sep 2020 19:53:07 +0000 Subject: [PATCH] Replace SelectionFocused variable I accidentally added --- .../CustomControls/InputRoll/InputRoll.cs | 5 ---- .../tools/TAStudio/TAStudio.MenuItems.cs | 26 +++++++++---------- .../tools/TAStudio/TAStudio.cs | 2 +- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs b/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs index 7e7cf6de3c..0e93bd8844 100644 --- a/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs +++ b/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs @@ -946,11 +946,6 @@ namespace BizHawk.Client.EmuHawk public bool AnyRowsSelected => _selectedItems.Any(cell => cell.RowIndex.HasValue); - /// - /// Rows are selected and the selection is in focus. - /// - public bool SelectionFocused => AnyRowsSelected && Focused; - public IEnumerable GenerateContextMenuItems() { if (Rotatable) diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs index b15402ae0b..56eaca2217 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs @@ -205,7 +205,7 @@ namespace BizHawk.Client.EmuHawk private void SaveSelectionToMacroMenuItem_Click(object sender, EventArgs e) { - if (!TasView.SelectionFocused) + if (!TasView.Focused && TasView.AnyRowsSelected) { return; } @@ -230,7 +230,7 @@ namespace BizHawk.Client.EmuHawk private void PlaceMacroAtSelectionMenuItem_Click(object sender, EventArgs e) { - if (!TasView.SelectionFocused) + if (!TasView.Focused && TasView.AnyRowsSelected) { return; } @@ -392,7 +392,7 @@ namespace BizHawk.Client.EmuHawk private void SelectBetweenMarkersMenuItem_Click(object sender, EventArgs e) { - if (TasView.SelectionFocused) + if (TasView.Focused && TasView.AnyRowsSelected) { var prevMarker = CurrentTasMovie.Markers.PreviousOrCurrent(TasView.LastSelectedIndex ?? 0); var nextMarker = CurrentTasMovie.Markers.Next(TasView.LastSelectedIndex ?? 0); @@ -424,7 +424,7 @@ namespace BizHawk.Client.EmuHawk private void CopyMenuItem_Click(object sender, EventArgs e) { - if (TasView.SelectionFocused) + if (TasView.Focused && TasView.AnyRowsSelected) { _tasClipboard.Clear(); var list = TasView.SelectedRows.ToArray(); @@ -450,7 +450,7 @@ namespace BizHawk.Client.EmuHawk private void PasteMenuItem_Click(object sender, EventArgs e) { - if (TasView.SelectionFocused) + if (TasView.Focused && TasView.AnyRowsSelected) { // TODO: if highlighting 2 rows and pasting 3, only paste 2 of them // FCEUX Taseditor doesn't do this, but I think it is the expected behavior in editor programs @@ -493,7 +493,7 @@ namespace BizHawk.Client.EmuHawk private void PasteInsertMenuItem_Click(object sender, EventArgs e) { - if (TasView.SelectionFocused) + if (TasView.Focused && TasView.AnyRowsSelected) { // copy paste from PasteMenuItem_Click! IDataObject data = Clipboard.GetDataObject(); @@ -534,7 +534,7 @@ namespace BizHawk.Client.EmuHawk private void CutMenuItem_Click(object sender, EventArgs e) { - if (TasView.SelectionFocused) + if (TasView.Focused && TasView.AnyRowsSelected) { var needsToRollback = TasView.FirstSelectedIndex < Emulator.Frame; var rollBackFrame = TasView.FirstSelectedIndex ?? 0; @@ -572,7 +572,7 @@ namespace BizHawk.Client.EmuHawk private void ClearFramesMenuItem_Click(object sender, EventArgs e) { - if (TasView.SelectionFocused) + if (TasView.Focused && TasView.AnyRowsSelected) { var firstWithInput = FirstNonEmptySelectedFrame; bool needsToRollback = firstWithInput.HasValue && firstWithInput < Emulator.Frame; @@ -598,7 +598,7 @@ namespace BizHawk.Client.EmuHawk private void DeleteFramesMenuItem_Click(object sender, EventArgs e) { - if (TasView.SelectionFocused) + if (TasView.Focused && TasView.AnyRowsSelected) { var needsToRollback = TasView.FirstSelectedIndex < Emulator.Frame; var rollBackFrame = TasView.FirstSelectedIndex ?? 0; @@ -640,7 +640,7 @@ namespace BizHawk.Client.EmuHawk { for (int i = 0; i < timesToClone; i++) { - if (TasView.SelectionFocused) + if (TasView.Focused && TasView.AnyRowsSelected) { var framesToInsert = TasView.SelectedRows; var insertionFrame = Math.Min((TasView.LastSelectedIndex ?? 0) + 1, CurrentTasMovie.InputLogLength); @@ -665,7 +665,7 @@ namespace BizHawk.Client.EmuHawk private void InsertFrameMenuItem_Click(object sender, EventArgs e) { - if (TasView.SelectionFocused) + if (TasView.Focused && TasView.AnyRowsSelected) { var insertionFrame = TasView.FirstSelectedIndex ?? 0; var needsToRollback = TasView.FirstSelectedIndex < Emulator.Frame; @@ -684,7 +684,7 @@ namespace BizHawk.Client.EmuHawk private void InsertNumFramesMenuItem_Click(object sender, EventArgs e) { - if (TasView.SelectionFocused) + if (TasView.Focused && TasView.AnyRowsSelected) { int insertionFrame = TasView.FirstSelectedIndex ?? 0; using var framesPrompt = new FramesPrompt(); @@ -697,7 +697,7 @@ namespace BizHawk.Client.EmuHawk private void TruncateMenuItem_Click(object sender, EventArgs e) { - if (TasView.SelectionFocused) + if (TasView.Focused && TasView.AnyRowsSelected) { var rollbackFrame = TasView.LastSelectedIndex ?? 0; var needsToRollback = TasView.FirstSelectedIndex < Emulator.Frame; diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index 7caac936c1..8dd6d7ae88 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -702,7 +702,7 @@ namespace BizHawk.Client.EmuHawk private void DummyLoadMacro(string path) { - if (!TasView.SelectionFocused) + if (!TasView.Focused && TasView.AnyRowsSelected) { return; }