From 17faf42b6e6663f39ce6898e9e84175476ecd0af Mon Sep 17 00:00:00 2001 From: feos Date: Thu, 19 Jan 2017 21:55:18 +0300 Subject: [PATCH] tastudio: try to be a bit smarter with SelectedIndexChanged forces SetSplicer() calls, but only at InputRoll's OnMouseDown, the rest is handled by tastudio --- .../CustomControls/InputRoll.cs | 20 +++++-------------- .../tools/TAStudio/TAStudio.Designer.cs | 1 + 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs b/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs index c3bcb3b3c4..9d65525698 100644 --- a/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs +++ b/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs @@ -1152,19 +1152,14 @@ namespace BizHawk.Client.EmuHawk var hadIndex = SelectedItems.Any(); SelectedItems.Clear(); SelectCell(CurrentCell); - - // In this case the SelectCell did not invoke the change event since there was nothing to select - // But we went from selected to unselected, that is a change, so catch it here - if (hadIndex && CurrentCell.RowIndex.HasValue && CurrentCell.RowIndex > RowCount) - { - if (SelectedIndexChanged != null) - { - SelectedIndexChanged(this, new EventArgs()); - } - } } Refresh(); + + if (SelectedIndexChanged != null) + { + SelectedIndexChanged(this, new EventArgs()); + } } } @@ -1679,11 +1674,6 @@ namespace BizHawk.Client.EmuHawk SelectedItems.Add(CurrentCell); } } - - if (SelectedIndexChanged != null) - { - SelectedIndexChanged(this, new EventArgs()); - } } } diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs index ff7138d709..6cc40e1eb8 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs @@ -1251,6 +1251,7 @@ namespace BizHawk.Client.EmuHawk this.TasView.TabIndex = 1; this.TasView.ColumnClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.TasView_ColumnClick); this.TasView.ColumnRightClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.TasView_ColumnRightClick); + this.TasView.SelectedIndexChanged += new System.EventHandler(this.TasView_SelectedIndexChanged); this.TasView.RightMouseScrolled += new BizHawk.Client.EmuHawk.InputRoll.RightMouseScrollEventHandler(this.TasView_MouseWheel); this.TasView.ColumnReordered += new BizHawk.Client.EmuHawk.InputRoll.ColumnReorderedEventHandler(this.TasView_ColumnReordered); this.TasView.CellDropped += new BizHawk.Client.EmuHawk.InputRoll.CellDroppedEvent(this.TasView_CellDropped);