Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ private void SaveBk2BackupMenuItem_Click(object sender, EventArgs e)

private void SaveSelectionToMacroMenuItem_Click(object sender, EventArgs e)
{
if (!TasView.Focused && TasView.AnyRowsSelected)
if (!TasView.AnyRowsSelected)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This changes the semantics—but I think it was a typo before and should have read !TasView.Focused || !TasView.AnyRowsSelected like elsewhere in this file, so it would now work as intended.

{
return;
}
Expand Down Expand Up @@ -177,7 +177,7 @@ private void SaveSelectionToMacroMenuItem_Click(object sender, EventArgs e)

private void PlaceMacroAtSelectionMenuItem_Click(object sender, EventArgs e)
{
if (!TasView.Focused && TasView.AnyRowsSelected)
if (!TasView.AnyRowsSelected)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

{
return;
}
Expand Down Expand Up @@ -321,7 +321,7 @@ private void SelectAllMenuItem_Click(object sender, EventArgs e)

private void SelectBetweenMarkersMenuItem_Click(object sender, EventArgs e)
{
if (TasView.Focused && TasView.AnyRowsSelected)
if (TasView.AnyRowsSelected)
{
var selectionEnd = TasView.SelectionEndIndex ?? 0;
var prevMarker = CurrentTasMovie.Markers.PreviousOrCurrent(selectionEnd);
Expand Down Expand Up @@ -355,7 +355,7 @@ private void ReselectClipboardMenuItem_Click(object sender, EventArgs e)

private void CopyMenuItem_Click(object sender, EventArgs e)
{
if (TasView.Focused && TasView.AnyRowsSelected)
if (TasView.AnyRowsSelected)
{
_tasClipboard.Clear();
var list = TasView.SelectedRows.ToArray();
Expand All @@ -381,7 +381,7 @@ private void CopyMenuItem_Click(object sender, EventArgs e)

private void PasteMenuItem_Click(object sender, EventArgs e)
{
if (TasView.Focused && TasView.AnyRowsSelected)
if (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
Expand Down Expand Up @@ -419,7 +419,7 @@ private void PasteMenuItem_Click(object sender, EventArgs e)

private void PasteInsertMenuItem_Click(object sender, EventArgs e)
{
if (TasView.Focused && TasView.AnyRowsSelected)
if (TasView.AnyRowsSelected)
{
// copy paste from PasteMenuItem_Click!
IDataObject data = Clipboard.GetDataObject();
Expand Down Expand Up @@ -455,9 +455,8 @@ private void PasteInsertMenuItem_Click(object sender, EventArgs e)

private void CutMenuItem_Click(object sender, EventArgs e)
{
if (TasView.Focused && TasView.AnyRowsSelected)
if (TasView.AnyRowsSelected)
{

_tasClipboard.Clear();
var list = TasView.SelectedRows.ToArray();
var sb = new StringBuilder();
Expand All @@ -482,7 +481,7 @@ private void CutMenuItem_Click(object sender, EventArgs e)

private void ClearFramesMenuItem_Click(object sender, EventArgs e)
{
if (!TasView.Focused || !TasView.AnyRowsSelected) return;
if (!TasView.AnyRowsSelected) return;

CurrentTasMovie.SingleInvalidation(() =>
{
Expand All @@ -498,7 +497,7 @@ private void ClearFramesMenuItem_Click(object sender, EventArgs e)

private void DeleteFramesMenuItem_Click(object sender, EventArgs e)
{
if (TasView.Focused && TasView.AnyRowsSelected)
if (TasView.AnyRowsSelected)
{
var selectionStart = TasView.SelectionStartIndex;
var rollBackFrame = selectionStart ?? 0;
Expand Down Expand Up @@ -531,7 +530,7 @@ private void CloneFramesXTimesMenuItem_Click(object sender, EventArgs e)

private void CloneFramesXTimes(int timesToClone)
{
if (!TasView.Focused || !TasView.AnyRowsSelected) return;
if (!TasView.AnyRowsSelected) return;

var framesToInsert = TasView.SelectedRows;
var insertionFrame = Math.Min((TasView.SelectionEndIndex ?? 0) + 1, CurrentTasMovie.InputLogLength);
Expand All @@ -557,15 +556,15 @@ private void CloneFramesXTimes(int timesToClone)

private void InsertFrameMenuItem_Click(object sender, EventArgs e)
{
if (TasView.Focused && TasView.AnyRowsSelected)
if (TasView.AnyRowsSelected)
{
CurrentTasMovie.InsertEmptyFrame(TasView.SelectionStartIndex ?? 0);
}
}

private void InsertNumFramesMenuItem_Click(object sender, EventArgs e)
{
if (TasView.Focused && TasView.AnyRowsSelected)
if (TasView.AnyRowsSelected)
{
var insertionFrame = TasView.SelectionStartIndex ?? 0;
using var framesPrompt = new FramesPrompt();
Expand All @@ -578,7 +577,7 @@ private void InsertNumFramesMenuItem_Click(object sender, EventArgs e)

private void TruncateMenuItem_Click(object sender, EventArgs e)
{
if (TasView.Focused && TasView.AnyRowsSelected)
if (TasView.AnyRowsSelected)
{
CurrentTasMovie.Truncate(TasView.SelectionEndIndex ?? 0);
MarkerControl.MarkerInputRoll.TruncateSelection(CurrentTasMovie.Markers.Count - 1);
Expand Down
Loading