diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs index e1de34462d..04e29de3a5 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs @@ -25,13 +25,13 @@ namespace BizHawk.Client.EmuHawk { Name = "FrameColumn", Text = "Frame", - Width = 64 + Width = 52 }, new InputRoll.RollColumn { Name = "LabelColumn", - Text = "Label", - Width = 133 + Text = "", + Width = 139 } }); diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs index 74c504edb3..d71994a8d6 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs @@ -131,9 +131,11 @@ namespace BizHawk.Client.EmuHawk this.InsertNumFramesContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator18 = new System.Windows.Forms.ToolStripSeparator(); this.TruncateContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); this.TASMenu.SuspendLayout(); this.TasStatusStrip.SuspendLayout(); this.RightClickMenu.SuspendLayout(); + this.groupBox1.SuspendLayout(); this.SuspendLayout(); // // TASMenu @@ -724,7 +726,7 @@ namespace BizHawk.Client.EmuHawk // toolStripSeparator19 // this.toolStripSeparator19.Name = "toolStripSeparator19"; - this.toolStripSeparator19.Size = new System.Drawing.Size(149, 6); + this.toolStripSeparator19.Size = new System.Drawing.Size(57, 6); // // HelpSubMenu // @@ -819,10 +821,12 @@ namespace BizHawk.Client.EmuHawk // // MarkerControl // - this.MarkerControl.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.MarkerControl.Location = new System.Drawing.Point(302, 129); + this.MarkerControl.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.MarkerControl.Location = new System.Drawing.Point(2, 16); this.MarkerControl.Name = "MarkerControl"; - this.MarkerControl.Size = new System.Drawing.Size(204, 215); + this.MarkerControl.Size = new System.Drawing.Size(198, 215); this.MarkerControl.TabIndex = 6; this.MarkerControl.Tastudio = null; // @@ -953,12 +957,22 @@ namespace BizHawk.Client.EmuHawk this.TruncateContextMenuItem.Text = "Truncate Movie"; this.TruncateContextMenuItem.Click += new System.EventHandler(this.TruncateMenuItem_Click); // + // groupBox1 + // + this.groupBox1.Controls.Add(this.MarkerControl); + this.groupBox1.Location = new System.Drawing.Point(302, 129); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(201, 237); + this.groupBox1.TabIndex = 7; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Markers"; + // // TAStudio // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(506, 519); - this.Controls.Add(this.MarkerControl); + this.Controls.Add(this.groupBox1); this.Controls.Add(this.TasPlaybackBox); this.Controls.Add(this.TasStatusStrip); this.Controls.Add(this.TASMenu); @@ -976,6 +990,7 @@ namespace BizHawk.Client.EmuHawk this.TasStatusStrip.ResumeLayout(false); this.TasStatusStrip.PerformLayout(); this.RightClickMenu.ResumeLayout(false); + this.groupBox1.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -1082,5 +1097,6 @@ namespace BizHawk.Client.EmuHawk private System.Windows.Forms.ToolStripMenuItem RotateMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator21; private System.Windows.Forms.ToolStripMenuItem DefaultStateSettingsMenuItem; + private System.Windows.Forms.GroupBox groupBox1; } } \ No newline at end of file