From d6859b64a33aef94cef492e8a37b9ab6579e1545 Mon Sep 17 00:00:00 2001 From: adelikat Date: Fri, 19 Sep 2014 20:49:51 +0000 Subject: [PATCH] Tastudio - refactor some context menu logic --- .../tools/TAStudio/TAStudio.Designer.cs | 9 +++++---- .../tools/TAStudio/TAStudio.ListView.cs | 2 -- BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs | 5 +++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs index 8b0b028128..fba40131f8 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs @@ -698,11 +698,11 @@ namespace BizHawk.Client.EmuHawk this.TasView.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.TasView.FullRowSelect = true; this.TasView.HorizontalOrientation = false; - this.TasView.RowCount = 0; - this.TasView.LastVisibleRow = 22; + this.TasView.LastVisibleRow = 23; this.TasView.Location = new System.Drawing.Point(8, 27); - this.TasView.MultiSelect = true; + this.TasView.MaxCharactersInHorizontal = 1; this.TasView.Name = "TasView"; + this.TasView.RowCount = 0; this.TasView.Size = new System.Drawing.Size(288, 471); this.TasView.TabIndex = 1; this.TasView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.TasView_ColumnClick); @@ -776,7 +776,8 @@ namespace BizHawk.Client.EmuHawk this.toolStripSeparator18, this.TruncateContextMenuItem}); this.RightClickMenu.Name = "RightClickMenu"; - this.RightClickMenu.Size = new System.Drawing.Size(273, 270); + this.RightClickMenu.Size = new System.Drawing.Size(273, 292); + this.RightClickMenu.Opened += new System.EventHandler(this.RightClickMenu_Opened); // // SetMarkersContextMenuItem // diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs index e9c6e53c9b..28079a204c 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs @@ -286,8 +286,6 @@ namespace BizHawk.Client.EmuHawk var buttonName = TasView.CurrentCell.Column.Name; if (TasView.SelectedRows.IndexOf(frame) != -1 && (buttonName == MarkerColumnName || buttonName == FrameColumnName)) { - //Disable the option to remove markers if no markers are selected (FCUEX does this). - RemoveMarkersContextMenuItem.Enabled = _currentTasMovie.Markers.Any(m => TasView.SelectedRows.Contains(m.Frame)); RightClickMenu.Show(TasView, e.X, e.Y); } } diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index 94988ac5cf..2e31bff7e6 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -1024,6 +1024,11 @@ namespace BizHawk.Client.EmuHawk SetTextProperty(); } + private void RightClickMenu_Opened(object sender, EventArgs e) + { + RemoveMarkersContextMenuItem.Enabled = _currentTasMovie.Markers.Any(m => TasView.SelectedRows.Contains(m.Frame)); // Disable the option to remove markers if no markers are selected (FCUEX does this). + } + #endregion #endregion