From f28f47b94187ffd267f908e08f3e65360908e46f Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 23 Aug 2014 19:01:47 +0000 Subject: [PATCH] replace the marker list with an input roll instead of virtuallistview, part of this commit was loosing the item active event, it needs to be replaced with a double click event --- .../tools/TAStudio/MarkerControl.Designer.cs | 12 ++---------- .../tools/TAStudio/MarkerControl.cs | 3 +-- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs index 836d2316b3..1d8d4f9b0b 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs @@ -30,7 +30,7 @@ { this.AddBtn = new System.Windows.Forms.Button(); this.RemoveBtn = new System.Windows.Forms.Button(); - this.MarkerView = new BizHawk.Client.EmuHawk.VirtualListView(); + this.MarkerView = new InputRoll(); this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.SuspendLayout(); @@ -63,26 +63,18 @@ this.MarkerView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.MarkerView.BlazingFast = false; - this.MarkerView.CheckBoxes = true; this.MarkerView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.columnHeader1, this.columnHeader2}); this.MarkerView.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.MarkerView.FullRowSelect = true; this.MarkerView.GridLines = true; - this.MarkerView.HideSelection = false; this.MarkerView.ItemCount = 0; this.MarkerView.Location = new System.Drawing.Point(3, 0); this.MarkerView.Name = "MarkerView"; - this.MarkerView.SelectAllInProgress = false; - this.MarkerView.selectedItem = -1; this.MarkerView.Size = new System.Drawing.Size(198, 209); this.MarkerView.TabIndex = 5; this.MarkerView.TabStop = false; - this.MarkerView.UseCompatibleStateImageBehavior = false; - this.MarkerView.View = System.Windows.Forms.View.Details; - this.MarkerView.ItemActivate += new System.EventHandler(this.MarkerView_ItemActivate); this.MarkerView.SelectedIndexChanged += new System.EventHandler(this.MarkerView_SelectedIndexChanged); // // columnHeader1 @@ -111,7 +103,7 @@ #endregion - private VirtualListView MarkerView; + private InputRoll MarkerView; public System.Windows.Forms.ColumnHeader columnHeader1; private System.Windows.Forms.ColumnHeader columnHeader2; private System.Windows.Forms.Button AddBtn; diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs index f54ae9579c..39c1ce6100 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs @@ -31,9 +31,8 @@ namespace BizHawk.Client.EmuHawk public void UpdateValues() { - MarkerView.BlazingFast = true; MarkerView.ItemCount = Tastudio.CurrentMovie.Markers.Count; - MarkerView.BlazingFast = false; + MarkerView.Refresh(); } private void MarkerView_QueryItemBkColor(int index, int column, ref Color color)