Skip to content

Commit 87b268a

Browse files
committed
Fix 4375 by not requiring focus on TasView (and also don't require focus for any operations since it doesn't make sense to do that)
1 parent 910f3b4 commit 87b268a

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ private void SaveBk2BackupMenuItem_Click(object sender, EventArgs e)
143143

144144
private void SaveSelectionToMacroMenuItem_Click(object sender, EventArgs e)
145145
{
146-
if (!TasView.Focused && TasView.AnyRowsSelected)
146+
if (!TasView.AnyRowsSelected)
147147
{
148148
return;
149149
}
@@ -177,7 +177,7 @@ private void SaveSelectionToMacroMenuItem_Click(object sender, EventArgs e)
177177

178178
private void PlaceMacroAtSelectionMenuItem_Click(object sender, EventArgs e)
179179
{
180-
if (!TasView.Focused && TasView.AnyRowsSelected)
180+
if (!TasView.AnyRowsSelected)
181181
{
182182
return;
183183
}
@@ -321,7 +321,7 @@ private void SelectAllMenuItem_Click(object sender, EventArgs e)
321321

322322
private void SelectBetweenMarkersMenuItem_Click(object sender, EventArgs e)
323323
{
324-
if (TasView.Focused && TasView.AnyRowsSelected)
324+
if (TasView.AnyRowsSelected)
325325
{
326326
var selectionEnd = TasView.SelectionEndIndex ?? 0;
327327
var prevMarker = CurrentTasMovie.Markers.PreviousOrCurrent(selectionEnd);
@@ -355,7 +355,7 @@ private void ReselectClipboardMenuItem_Click(object sender, EventArgs e)
355355

356356
private void CopyMenuItem_Click(object sender, EventArgs e)
357357
{
358-
if (TasView.Focused && TasView.AnyRowsSelected)
358+
if (TasView.AnyRowsSelected)
359359
{
360360
_tasClipboard.Clear();
361361
var list = TasView.SelectedRows.ToArray();
@@ -381,7 +381,7 @@ private void CopyMenuItem_Click(object sender, EventArgs e)
381381

382382
private void PasteMenuItem_Click(object sender, EventArgs e)
383383
{
384-
if (TasView.Focused && TasView.AnyRowsSelected)
384+
if (TasView.AnyRowsSelected)
385385
{
386386
// TODO: if highlighting 2 rows and pasting 3, only paste 2 of them
387387
// FCEUX Taseditor doesn't do this, but I think it is the expected behavior in editor programs
@@ -419,7 +419,7 @@ private void PasteMenuItem_Click(object sender, EventArgs e)
419419

420420
private void PasteInsertMenuItem_Click(object sender, EventArgs e)
421421
{
422-
if (TasView.Focused && TasView.AnyRowsSelected)
422+
if (TasView.AnyRowsSelected)
423423
{
424424
// copy paste from PasteMenuItem_Click!
425425
IDataObject data = Clipboard.GetDataObject();
@@ -455,9 +455,8 @@ private void PasteInsertMenuItem_Click(object sender, EventArgs e)
455455

456456
private void CutMenuItem_Click(object sender, EventArgs e)
457457
{
458-
if (TasView.Focused && TasView.AnyRowsSelected)
458+
if (TasView.AnyRowsSelected)
459459
{
460-
461460
_tasClipboard.Clear();
462461
var list = TasView.SelectedRows.ToArray();
463462
var sb = new StringBuilder();
@@ -482,7 +481,7 @@ private void CutMenuItem_Click(object sender, EventArgs e)
482481

483482
private void ClearFramesMenuItem_Click(object sender, EventArgs e)
484483
{
485-
if (!TasView.Focused || !TasView.AnyRowsSelected) return;
484+
if (!TasView.AnyRowsSelected) return;
486485

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

499498
private void DeleteFramesMenuItem_Click(object sender, EventArgs e)
500499
{
501-
if (TasView.Focused && TasView.AnyRowsSelected)
500+
if (TasView.AnyRowsSelected)
502501
{
503502
var selectionStart = TasView.SelectionStartIndex;
504503
var rollBackFrame = selectionStart ?? 0;
@@ -531,7 +530,7 @@ private void CloneFramesXTimesMenuItem_Click(object sender, EventArgs e)
531530

532531
private void CloneFramesXTimes(int timesToClone)
533532
{
534-
if (!TasView.Focused || !TasView.AnyRowsSelected) return;
533+
if (!TasView.AnyRowsSelected) return;
535534

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

558557
private void InsertFrameMenuItem_Click(object sender, EventArgs e)
559558
{
560-
if (TasView.Focused && TasView.AnyRowsSelected)
559+
if (TasView.AnyRowsSelected)
561560
{
562561
CurrentTasMovie.InsertEmptyFrame(TasView.SelectionStartIndex ?? 0);
563562
}
564563
}
565564

566565
private void InsertNumFramesMenuItem_Click(object sender, EventArgs e)
567566
{
568-
if (TasView.Focused && TasView.AnyRowsSelected)
567+
if (TasView.AnyRowsSelected)
569568
{
570569
var insertionFrame = TasView.SelectionStartIndex ?? 0;
571570
using var framesPrompt = new FramesPrompt();
@@ -578,7 +577,7 @@ private void InsertNumFramesMenuItem_Click(object sender, EventArgs e)
578577

579578
private void TruncateMenuItem_Click(object sender, EventArgs e)
580579
{
581-
if (TasView.Focused && TasView.AnyRowsSelected)
580+
if (TasView.AnyRowsSelected)
582581
{
583582
CurrentTasMovie.Truncate(TasView.SelectionEndIndex ?? 0);
584583
MarkerControl.MarkerInputRoll.TruncateSelection(CurrentTasMovie.Markers.Count - 1);

0 commit comments

Comments
 (0)