From eed94c11cc1d017f60475df072c7ea62e3a8a107 Mon Sep 17 00:00:00 2001 From: "J.D. Purcell" Date: Sun, 13 Oct 2019 13:04:06 -0400 Subject: [PATCH] TAStudio: Improve control alignment and fix branches/markers not showing due to DPI scaling. Fixes #1151. --- .../TAStudio/BookmarksBranchesBox.Designer.cs | 62 ++++++------- .../tools/TAStudio/MarkerControl.Designer.cs | 91 +++++++++++-------- .../tools/TAStudio/PlaybackBox.Designer.cs | 10 +- .../tools/TAStudio/TAStudio.Designer.cs | 48 +++------- 4 files changed, 102 insertions(+), 109 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs index bacdef1f33..3e91765166 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs @@ -54,9 +54,6 @@ // // BookmarksBranchesGroupBox // - this.BookmarksBranchesGroupBox.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.BookmarksBranchesGroupBox.Controls.Add(this.UndoBranchButton); this.BookmarksBranchesGroupBox.Controls.Add(this.JumpToBranchButton); this.BookmarksBranchesGroupBox.Controls.Add(this.UpdateBranchButton); @@ -64,7 +61,8 @@ this.BookmarksBranchesGroupBox.Controls.Add(this.AddBranchButton); this.BookmarksBranchesGroupBox.Controls.Add(this.LoadBranchButton); this.BookmarksBranchesGroupBox.Controls.Add(this.BranchView); - this.BookmarksBranchesGroupBox.Location = new System.Drawing.Point(3, 0); + this.BookmarksBranchesGroupBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.BookmarksBranchesGroupBox.Location = new System.Drawing.Point(0, 0); this.BookmarksBranchesGroupBox.Name = "BookmarksBranchesGroupBox"; this.BookmarksBranchesGroupBox.Size = new System.Drawing.Size(198, 278); this.BookmarksBranchesGroupBox.TabIndex = 0; @@ -76,10 +74,10 @@ this.UndoBranchButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.UndoBranchButton.Enabled = false; this.UndoBranchButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.undo; - this.UndoBranchButton.Location = new System.Drawing.Point(159, 249); + this.UndoBranchButton.Location = new System.Drawing.Point(156, 247); this.UndoBranchButton.Name = "UndoBranchButton"; - this.UndoBranchButton.Size = new System.Drawing.Size(23, 23); - this.UndoBranchButton.TabIndex = 10; + this.UndoBranchButton.Size = new System.Drawing.Size(24, 24); + this.UndoBranchButton.TabIndex = 6; this.UndoBranchButton.UseVisualStyleBackColor = true; this.UndoBranchButton.Click += new System.EventHandler(this.UndoBranchToolStripMenuItem_Click); // @@ -88,10 +86,10 @@ this.JumpToBranchButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.JumpToBranchButton.Enabled = false; this.JumpToBranchButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.JumpTo; - this.JumpToBranchButton.Location = new System.Drawing.Point(130, 249); + this.JumpToBranchButton.Location = new System.Drawing.Point(126, 247); this.JumpToBranchButton.Name = "JumpToBranchButton"; - this.JumpToBranchButton.Size = new System.Drawing.Size(23, 23); - this.JumpToBranchButton.TabIndex = 9; + this.JumpToBranchButton.Size = new System.Drawing.Size(24, 24); + this.JumpToBranchButton.TabIndex = 5; this.toolTip1.SetToolTip(this.JumpToBranchButton, "Jump To Branch Frame"); this.JumpToBranchButton.UseVisualStyleBackColor = true; this.JumpToBranchButton.Click += new System.EventHandler(this.JumpToBranchToolStripMenuItem_Click); @@ -101,9 +99,9 @@ this.UpdateBranchButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.UpdateBranchButton.Enabled = false; this.UpdateBranchButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.reboot; - this.UpdateBranchButton.Location = new System.Drawing.Point(99, 249); + this.UpdateBranchButton.Location = new System.Drawing.Point(96, 247); this.UpdateBranchButton.Name = "UpdateBranchButton"; - this.UpdateBranchButton.Size = new System.Drawing.Size(25, 23); + this.UpdateBranchButton.Size = new System.Drawing.Size(24, 24); this.UpdateBranchButton.TabIndex = 4; this.toolTip1.SetToolTip(this.UpdateBranchButton, "Update Branch"); this.UpdateBranchButton.UseVisualStyleBackColor = true; @@ -113,10 +111,10 @@ // this.AddWithTextBranchButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.AddWithTextBranchButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AddEdit; - this.AddWithTextBranchButton.Location = new System.Drawing.Point(37, 249); + this.AddWithTextBranchButton.Location = new System.Drawing.Point(36, 247); this.AddWithTextBranchButton.Name = "AddWithTextBranchButton"; - this.AddWithTextBranchButton.Size = new System.Drawing.Size(25, 23); - this.AddWithTextBranchButton.TabIndex = 3; + this.AddWithTextBranchButton.Size = new System.Drawing.Size(24, 24); + this.AddWithTextBranchButton.TabIndex = 2; this.toolTip1.SetToolTip(this.AddWithTextBranchButton, "Add Branch with Text"); this.AddWithTextBranchButton.UseVisualStyleBackColor = true; this.AddWithTextBranchButton.Click += new System.EventHandler(this.AddBranchWithTexToolStripMenuItem_Click); @@ -125,10 +123,10 @@ // this.AddBranchButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.AddBranchButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.add; - this.AddBranchButton.Location = new System.Drawing.Point(6, 249); + this.AddBranchButton.Location = new System.Drawing.Point(6, 247); this.AddBranchButton.Name = "AddBranchButton"; - this.AddBranchButton.Size = new System.Drawing.Size(25, 23); - this.AddBranchButton.TabIndex = 2; + this.AddBranchButton.Size = new System.Drawing.Size(24, 24); + this.AddBranchButton.TabIndex = 1; this.toolTip1.SetToolTip(this.AddBranchButton, "Add Branch"); this.AddBranchButton.UseVisualStyleBackColor = true; this.AddBranchButton.Click += new System.EventHandler(this.AddBranchToolStripMenuItem_Click); @@ -138,10 +136,10 @@ this.LoadBranchButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.LoadBranchButton.Enabled = false; this.LoadBranchButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Debugger; - this.LoadBranchButton.Location = new System.Drawing.Point(68, 249); + this.LoadBranchButton.Location = new System.Drawing.Point(66, 247); this.LoadBranchButton.Name = "LoadBranchButton"; - this.LoadBranchButton.Size = new System.Drawing.Size(25, 23); - this.LoadBranchButton.TabIndex = 1; + this.LoadBranchButton.Size = new System.Drawing.Size(24, 24); + this.LoadBranchButton.TabIndex = 3; this.toolTip1.SetToolTip(this.LoadBranchButton, "Load Branch"); this.LoadBranchButton.UseVisualStyleBackColor = true; this.LoadBranchButton.Click += new System.EventHandler(this.LoadBranchToolStripMenuItem_Click); @@ -193,14 +191,14 @@ this.toolStripSeparator2, this.RemoveBranchContextMenuItem}); this.BranchesContextMenu.Name = "BranchesContextMenu"; - this.BranchesContextMenu.Size = new System.Drawing.Size(153, 208); + this.BranchesContextMenu.Size = new System.Drawing.Size(147, 186); this.BranchesContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.BranchesContextMenu_Opening); // // AddBranchContextMenu // this.AddBranchContextMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.add; this.AddBranchContextMenu.Name = "AddBranchContextMenu"; - this.AddBranchContextMenu.Size = new System.Drawing.Size(152, 22); + this.AddBranchContextMenu.Size = new System.Drawing.Size(146, 22); this.AddBranchContextMenu.Text = "Add"; this.AddBranchContextMenu.Click += new System.EventHandler(this.AddBranchToolStripMenuItem_Click); // @@ -208,7 +206,7 @@ // this.AddBranchWithTextContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AddEdit; this.AddBranchWithTextContextMenuItem.Name = "AddBranchWithTextContextMenuItem"; - this.AddBranchWithTextContextMenuItem.Size = new System.Drawing.Size(152, 22); + this.AddBranchWithTextContextMenuItem.Size = new System.Drawing.Size(146, 22); this.AddBranchWithTextContextMenuItem.Text = "Add with Text"; this.AddBranchWithTextContextMenuItem.Click += new System.EventHandler(this.AddBranchWithTexToolStripMenuItem_Click); // @@ -216,7 +214,7 @@ // this.LoadBranchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Debugger; this.LoadBranchContextMenuItem.Name = "LoadBranchContextMenuItem"; - this.LoadBranchContextMenuItem.Size = new System.Drawing.Size(152, 22); + this.LoadBranchContextMenuItem.Size = new System.Drawing.Size(146, 22); this.LoadBranchContextMenuItem.Text = "Load"; this.LoadBranchContextMenuItem.Click += new System.EventHandler(this.LoadBranchToolStripMenuItem_Click); // @@ -224,7 +222,7 @@ // this.UpdateBranchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.reboot; this.UpdateBranchContextMenuItem.Name = "UpdateBranchContextMenuItem"; - this.UpdateBranchContextMenuItem.Size = new System.Drawing.Size(152, 22); + this.UpdateBranchContextMenuItem.Size = new System.Drawing.Size(146, 22); this.UpdateBranchContextMenuItem.Text = "&Update"; this.UpdateBranchContextMenuItem.Click += new System.EventHandler(this.UpdateBranchToolStripMenuItem_Click); // @@ -232,7 +230,7 @@ // this.EditBranchTextContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.pencil; this.EditBranchTextContextMenuItem.Name = "EditBranchTextContextMenuItem"; - this.EditBranchTextContextMenuItem.Size = new System.Drawing.Size(152, 22); + this.EditBranchTextContextMenuItem.Size = new System.Drawing.Size(146, 22); this.EditBranchTextContextMenuItem.Text = "Edit Text"; this.EditBranchTextContextMenuItem.Click += new System.EventHandler(this.EditBranchTextToolStripMenuItem_Click); // @@ -240,7 +238,7 @@ // this.JumpToBranchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.JumpTo; this.JumpToBranchContextMenuItem.Name = "JumpToBranchContextMenuItem"; - this.JumpToBranchContextMenuItem.Size = new System.Drawing.Size(152, 22); + this.JumpToBranchContextMenuItem.Size = new System.Drawing.Size(146, 22); this.JumpToBranchContextMenuItem.Text = "Jump To"; this.JumpToBranchContextMenuItem.Click += new System.EventHandler(this.JumpToBranchToolStripMenuItem_Click); // @@ -249,20 +247,20 @@ this.UndoBranchToolStripMenuItem.Enabled = false; this.UndoBranchToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.undo; this.UndoBranchToolStripMenuItem.Name = "UndoBranchToolStripMenuItem"; - this.UndoBranchToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.UndoBranchToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.UndoBranchToolStripMenuItem.Text = "Undo"; this.UndoBranchToolStripMenuItem.Click += new System.EventHandler(this.UndoBranchToolStripMenuItem_Click); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(149, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(143, 6); // // RemoveBranchContextMenuItem // this.RemoveBranchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; this.RemoveBranchContextMenuItem.Name = "RemoveBranchContextMenuItem"; - this.RemoveBranchContextMenuItem.Size = new System.Drawing.Size(152, 22); + this.RemoveBranchContextMenuItem.Size = new System.Drawing.Size(146, 22); this.RemoveBranchContextMenuItem.Text = "Remove"; this.RemoveBranchContextMenuItem.Click += new System.EventHandler(this.RemoveBranchToolStripMenuItem_Click); // @@ -271,7 +269,7 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.BookmarksBranchesGroupBox); this.Name = "BookmarksBranchesBox"; - this.Size = new System.Drawing.Size(204, 281); + this.Size = new System.Drawing.Size(198, 278); this.BookmarksBranchesGroupBox.ResumeLayout(false); this.BranchesContextMenu.ResumeLayout(false); this.ResumeLayout(false); diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs index fef9164076..a3726d0fe4 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs @@ -44,7 +44,9 @@ this.ScrollToMarkerButton = new System.Windows.Forms.Button(); this.AddMarkerWithTextButton = new System.Windows.Forms.Button(); this.MarkerView = new BizHawk.Client.EmuHawk.InputRoll(); + this.MarkersGroupBox = new System.Windows.Forms.GroupBox(); this.MarkerContextMenu.SuspendLayout(); + this.MarkersGroupBox.SuspendLayout(); this.SuspendLayout(); // // MarkerContextMenu @@ -57,14 +59,14 @@ this.toolStripSeparator1, this.RemoveMarkerToolStripMenuItem}); this.MarkerContextMenu.Name = "MarkerContextMenu"; - this.MarkerContextMenu.Size = new System.Drawing.Size(126, 120); + this.MarkerContextMenu.Size = new System.Drawing.Size(119, 120); this.MarkerContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.MarkerContextMenu_Opening); // // JumpToMarkerToolStripMenuItem // this.JumpToMarkerToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.JumpTo; this.JumpToMarkerToolStripMenuItem.Name = "JumpToMarkerToolStripMenuItem"; - this.JumpToMarkerToolStripMenuItem.Size = new System.Drawing.Size(125, 22); + this.JumpToMarkerToolStripMenuItem.Size = new System.Drawing.Size(118, 22); this.JumpToMarkerToolStripMenuItem.Text = "Jump To"; this.JumpToMarkerToolStripMenuItem.Click += new System.EventHandler(this.JumpToMarkerToolStripMenuItem_Click); // @@ -72,7 +74,7 @@ // this.ScrollToMarkerToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.ScrollTo; this.ScrollToMarkerToolStripMenuItem.Name = "ScrollToMarkerToolStripMenuItem"; - this.ScrollToMarkerToolStripMenuItem.Size = new System.Drawing.Size(125, 22); + this.ScrollToMarkerToolStripMenuItem.Size = new System.Drawing.Size(118, 22); this.ScrollToMarkerToolStripMenuItem.Text = "Scroll To"; this.ScrollToMarkerToolStripMenuItem.Click += new System.EventHandler(this.ScrollToMarkerToolStripMenuItem_Click); // @@ -80,7 +82,7 @@ // this.EditMarkerToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.pencil; this.EditMarkerToolStripMenuItem.Name = "EditMarkerToolStripMenuItem"; - this.EditMarkerToolStripMenuItem.Size = new System.Drawing.Size(125, 22); + this.EditMarkerToolStripMenuItem.Size = new System.Drawing.Size(118, 22); this.EditMarkerToolStripMenuItem.Text = "Edit"; this.EditMarkerToolStripMenuItem.Click += new System.EventHandler(this.EditMarkerToolStripMenuItem_Click); // @@ -88,20 +90,20 @@ // this.AddMarkerToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.add; this.AddMarkerToolStripMenuItem.Name = "AddMarkerToolStripMenuItem"; - this.AddMarkerToolStripMenuItem.Size = new System.Drawing.Size(125, 22); + this.AddMarkerToolStripMenuItem.Size = new System.Drawing.Size(118, 22); this.AddMarkerToolStripMenuItem.Text = "Add"; this.AddMarkerToolStripMenuItem.Click += new System.EventHandler(this.AddMarkerToolStripMenuItem_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(122, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(115, 6); // // RemoveMarkerToolStripMenuItem // this.RemoveMarkerToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; this.RemoveMarkerToolStripMenuItem.Name = "RemoveMarkerToolStripMenuItem"; - this.RemoveMarkerToolStripMenuItem.Size = new System.Drawing.Size(125, 22); + this.RemoveMarkerToolStripMenuItem.Size = new System.Drawing.Size(118, 22); this.RemoveMarkerToolStripMenuItem.Text = "Remove"; this.RemoveMarkerToolStripMenuItem.Click += new System.EventHandler(this.RemoveMarkerToolStripMenuItem_Click); // @@ -110,10 +112,10 @@ this.JumpToMarkerButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.JumpToMarkerButton.Enabled = false; this.JumpToMarkerButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.JumpTo; - this.JumpToMarkerButton.Location = new System.Drawing.Point(61, 174); + this.JumpToMarkerButton.Location = new System.Drawing.Point(66, 247); this.JumpToMarkerButton.Name = "JumpToMarkerButton"; - this.JumpToMarkerButton.Size = new System.Drawing.Size(23, 23); - this.JumpToMarkerButton.TabIndex = 8; + this.JumpToMarkerButton.Size = new System.Drawing.Size(24, 24); + this.JumpToMarkerButton.TabIndex = 3; this.toolTip1.SetToolTip(this.JumpToMarkerButton, "Jump To Marker Frame"); this.JumpToMarkerButton.UseVisualStyleBackColor = true; this.JumpToMarkerButton.Click += new System.EventHandler(this.JumpToMarkerToolStripMenuItem_Click); @@ -123,10 +125,10 @@ this.EditMarkerButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.EditMarkerButton.Enabled = false; this.EditMarkerButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.pencil; - this.EditMarkerButton.Location = new System.Drawing.Point(119, 174); + this.EditMarkerButton.Location = new System.Drawing.Point(126, 247); this.EditMarkerButton.Name = "EditMarkerButton"; - this.EditMarkerButton.Size = new System.Drawing.Size(23, 23); - this.EditMarkerButton.TabIndex = 9; + this.EditMarkerButton.Size = new System.Drawing.Size(24, 24); + this.EditMarkerButton.TabIndex = 5; this.toolTip1.SetToolTip(this.EditMarkerButton, "Edit Marker Text"); this.EditMarkerButton.UseVisualStyleBackColor = true; this.EditMarkerButton.Click += new System.EventHandler(this.EditMarkerToolStripMenuItem_Click); @@ -135,10 +137,10 @@ // this.AddMarkerButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.AddMarkerButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.add; - this.AddMarkerButton.Location = new System.Drawing.Point(3, 174); + this.AddMarkerButton.Location = new System.Drawing.Point(6, 247); this.AddMarkerButton.Name = "AddMarkerButton"; - this.AddMarkerButton.Size = new System.Drawing.Size(23, 23); - this.AddMarkerButton.TabIndex = 6; + this.AddMarkerButton.Size = new System.Drawing.Size(24, 24); + this.AddMarkerButton.TabIndex = 1; this.toolTip1.SetToolTip(this.AddMarkerButton, "Add Marker to Emulated Frame"); this.AddMarkerButton.UseVisualStyleBackColor = true; this.AddMarkerButton.Click += new System.EventHandler(this.AddMarkerToolStripMenuItem_Click); @@ -148,10 +150,10 @@ this.RemoveMarkerButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.RemoveMarkerButton.Enabled = false; this.RemoveMarkerButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; - this.RemoveMarkerButton.Location = new System.Drawing.Point(148, 174); + this.RemoveMarkerButton.Location = new System.Drawing.Point(156, 247); this.RemoveMarkerButton.Name = "RemoveMarkerButton"; - this.RemoveMarkerButton.Size = new System.Drawing.Size(23, 23); - this.RemoveMarkerButton.TabIndex = 7; + this.RemoveMarkerButton.Size = new System.Drawing.Size(24, 24); + this.RemoveMarkerButton.TabIndex = 6; this.toolTip1.SetToolTip(this.RemoveMarkerButton, "Remove Marker"); this.RemoveMarkerButton.UseVisualStyleBackColor = true; this.RemoveMarkerButton.Click += new System.EventHandler(this.RemoveMarkerToolStripMenuItem_Click); @@ -161,10 +163,10 @@ this.ScrollToMarkerButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.ScrollToMarkerButton.Enabled = false; this.ScrollToMarkerButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.ScrollTo; - this.ScrollToMarkerButton.Location = new System.Drawing.Point(90, 174); + this.ScrollToMarkerButton.Location = new System.Drawing.Point(96, 247); this.ScrollToMarkerButton.Name = "ScrollToMarkerButton"; - this.ScrollToMarkerButton.Size = new System.Drawing.Size(23, 23); - this.ScrollToMarkerButton.TabIndex = 10; + this.ScrollToMarkerButton.Size = new System.Drawing.Size(24, 24); + this.ScrollToMarkerButton.TabIndex = 4; this.toolTip1.SetToolTip(this.ScrollToMarkerButton, "Scroll View To Marker Frame"); this.ScrollToMarkerButton.UseVisualStyleBackColor = true; this.ScrollToMarkerButton.Click += new System.EventHandler(this.ScrollToMarkerToolStripMenuItem_Click); @@ -173,10 +175,10 @@ // this.AddMarkerWithTextButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.AddMarkerWithTextButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AddEdit; - this.AddMarkerWithTextButton.Location = new System.Drawing.Point(32, 174); + this.AddMarkerWithTextButton.Location = new System.Drawing.Point(36, 247); this.AddMarkerWithTextButton.Name = "AddMarkerWithTextButton"; - this.AddMarkerWithTextButton.Size = new System.Drawing.Size(23, 23); - this.AddMarkerWithTextButton.TabIndex = 11; + this.AddMarkerWithTextButton.Size = new System.Drawing.Size(24, 24); + this.AddMarkerWithTextButton.TabIndex = 2; this.toolTip1.SetToolTip(this.AddMarkerWithTextButton, "Add Marker with Text to Emulated Frame"); this.AddMarkerWithTextButton.UseVisualStyleBackColor = true; this.AddMarkerWithTextButton.Click += new System.EventHandler(this.AddMarkerWithTextToolStripMenuItem_Click); @@ -197,33 +199,48 @@ this.MarkerView.HideWasLagFrames = false; this.MarkerView.HorizontalOrientation = false; this.MarkerView.LagFramesToHide = 0; - this.MarkerView.Location = new System.Drawing.Point(3, 3); + this.MarkerView.LetKeysModifySelection = false; + this.MarkerView.Location = new System.Drawing.Point(6, 19); this.MarkerView.MaxCharactersInHorizontal = 1; this.MarkerView.MultiSelect = false; this.MarkerView.Name = "MarkerView"; this.MarkerView.RowCount = 0; this.MarkerView.ScrollSpeed = 1; - this.MarkerView.Size = new System.Drawing.Size(195, 165); - this.MarkerView.TabIndex = 5; + this.MarkerView.SeekingCutoffInterval = 0; + this.MarkerView.Size = new System.Drawing.Size(186, 224); + this.MarkerView.SuspendHotkeys = false; + this.MarkerView.TabIndex = 0; this.MarkerView.TabStop = false; this.MarkerView.SelectedIndexChanged += new System.EventHandler(this.MarkerView_SelectedIndexChanged); this.MarkerView.MouseClick += new System.Windows.Forms.MouseEventHandler(this.MarkerView_MouseClick); this.MarkerView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.MarkerView_MouseDoubleClick); // + // MarkersGroupBox + // + this.MarkersGroupBox.Controls.Add(this.MarkerView); + this.MarkersGroupBox.Controls.Add(this.AddMarkerButton); + this.MarkersGroupBox.Controls.Add(this.AddMarkerWithTextButton); + this.MarkersGroupBox.Controls.Add(this.RemoveMarkerButton); + this.MarkersGroupBox.Controls.Add(this.ScrollToMarkerButton); + this.MarkersGroupBox.Controls.Add(this.EditMarkerButton); + this.MarkersGroupBox.Controls.Add(this.JumpToMarkerButton); + this.MarkersGroupBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.MarkersGroupBox.Location = new System.Drawing.Point(0, 0); + this.MarkersGroupBox.Name = "MarkersGroupBox"; + this.MarkersGroupBox.Size = new System.Drawing.Size(198, 278); + this.MarkersGroupBox.TabIndex = 0; + this.MarkersGroupBox.TabStop = false; + this.MarkersGroupBox.Text = "Markers"; + // // MarkerControl // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; - this.Controls.Add(this.AddMarkerWithTextButton); - this.Controls.Add(this.MarkerView); - this.Controls.Add(this.EditMarkerButton); - this.Controls.Add(this.JumpToMarkerButton); - this.Controls.Add(this.ScrollToMarkerButton); - this.Controls.Add(this.RemoveMarkerButton); - this.Controls.Add(this.AddMarkerButton); + this.Controls.Add(this.MarkersGroupBox); this.Name = "MarkerControl"; - this.Size = new System.Drawing.Size(201, 200); + this.Size = new System.Drawing.Size(198, 278); this.Load += new System.EventHandler(this.MarkerControl_Load); this.MarkerContextMenu.ResumeLayout(false); + this.MarkersGroupBox.ResumeLayout(false); this.ResumeLayout(false); } @@ -245,6 +262,6 @@ private System.Windows.Forms.ToolStripMenuItem JumpToMarkerToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.Button AddMarkerWithTextButton; - + private System.Windows.Forms.GroupBox MarkersGroupBox; } } diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.Designer.cs index 2319cf7923..8b2042936e 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.Designer.cs @@ -45,9 +45,6 @@ // // PlaybackGroupBox // - this.PlaybackGroupBox.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.PlaybackGroupBox.Controls.Add(this.RecordingModeCheckbox); this.PlaybackGroupBox.Controls.Add(this.AutoRestoreCheckbox); this.PlaybackGroupBox.Controls.Add(this.TurboSeekCheckbox); @@ -57,9 +54,10 @@ this.PlaybackGroupBox.Controls.Add(this.PauseButton); this.PlaybackGroupBox.Controls.Add(this.RewindButton); this.PlaybackGroupBox.Controls.Add(this.PreviousMarkerButton); - this.PlaybackGroupBox.Location = new System.Drawing.Point(3, 3); + this.PlaybackGroupBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.PlaybackGroupBox.Location = new System.Drawing.Point(0, 0); this.PlaybackGroupBox.Name = "PlaybackGroupBox"; - this.PlaybackGroupBox.Size = new System.Drawing.Size(252, 104); + this.PlaybackGroupBox.Size = new System.Drawing.Size(198, 104); this.PlaybackGroupBox.TabIndex = 0; this.PlaybackGroupBox.TabStop = false; this.PlaybackGroupBox.Text = "Playback"; @@ -174,7 +172,7 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.PlaybackGroupBox); this.Name = "PlaybackBox"; - this.Size = new System.Drawing.Size(258, 110); + this.Size = new System.Drawing.Size(198, 104); this.PlaybackGroupBox.ResumeLayout(false); this.PlaybackGroupBox.PerformLayout(); this.ResumeLayout(false); diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs index aec14166a2..8972f50607 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs @@ -190,14 +190,12 @@ namespace BizHawk.Client.EmuHawk this.StartFromNowSeparator = new System.Windows.Forms.ToolStripSeparator(); this.StartNewProjectFromNowMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.StartANewProjectFromSaveRamMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); this.BookMarkControl = new BizHawk.Client.EmuHawk.BookmarksBranchesBox(); this.BranchesMarkersSplit = new System.Windows.Forms.SplitContainer(); this.MainVertialSplit = new System.Windows.Forms.SplitContainer(); this.TASMenu.SuspendLayout(); this.TasStatusStrip.SuspendLayout(); this.RightClickMenu.SuspendLayout(); - this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.BranchesMarkersSplit)).BeginInit(); this.BranchesMarkersSplit.Panel1.SuspendLayout(); this.BranchesMarkersSplit.Panel2.SuspendLayout(); @@ -1309,20 +1307,18 @@ namespace BizHawk.Client.EmuHawk // this.TasPlaybackBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.TasPlaybackBox.Location = new System.Drawing.Point(3, 4); + this.TasPlaybackBox.Location = new System.Drawing.Point(4, 4); this.TasPlaybackBox.Name = "TasPlaybackBox"; - this.TasPlaybackBox.Size = new System.Drawing.Size(204, 111); + this.TasPlaybackBox.Size = new System.Drawing.Size(200, 108); this.TasPlaybackBox.TabIndex = 5; this.TasPlaybackBox.Tastudio = null; // // MarkerControl // - 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.Dock = System.Windows.Forms.DockStyle.Fill; + this.MarkerControl.Location = new System.Drawing.Point(0, 0); this.MarkerControl.Name = "MarkerControl"; - this.MarkerControl.Size = new System.Drawing.Size(194, 193); + this.MarkerControl.Size = new System.Drawing.Size(200, 224); this.MarkerControl.TabIndex = 6; this.MarkerControl.Tastudio = null; // @@ -1540,31 +1536,16 @@ namespace BizHawk.Client.EmuHawk this.StartANewProjectFromSaveRamMenuItem.Text = "Start a new project from SaveRam"; this.StartANewProjectFromSaveRamMenuItem.Click += new System.EventHandler(this.StartANewProjectFromSaveRamMenuItem_Click); // - // groupBox1 - // - this.groupBox1.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.groupBox1.Controls.Add(this.MarkerControl); - this.groupBox1.Location = new System.Drawing.Point(-2, 3); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(204, 215); - this.groupBox1.TabIndex = 7; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Markers"; - // // BookMarkControl // - this.BookMarkControl.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.BookMarkControl.Dock = System.Windows.Forms.DockStyle.Fill; this.BookMarkControl.HoverInterval = 1; this.BookMarkControl.LoadedCallback = null; - this.BookMarkControl.Location = new System.Drawing.Point(-2, 5); + this.BookMarkControl.Location = new System.Drawing.Point(0, 0); this.BookMarkControl.Name = "BookMarkControl"; this.BookMarkControl.RemovedCallback = null; this.BookMarkControl.SavedCallback = null; - this.BookMarkControl.Size = new System.Drawing.Size(204, 173); + this.BookMarkControl.Size = new System.Drawing.Size(200, 184); this.BookMarkControl.TabIndex = 8; this.BookMarkControl.Tastudio = null; // @@ -1573,7 +1554,7 @@ namespace BizHawk.Client.EmuHawk this.BranchesMarkersSplit.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.BranchesMarkersSplit.Location = new System.Drawing.Point(3, 121); + this.BranchesMarkersSplit.Location = new System.Drawing.Point(4, 116); this.BranchesMarkersSplit.Name = "BranchesMarkersSplit"; this.BranchesMarkersSplit.Orientation = System.Windows.Forms.Orientation.Horizontal; // @@ -1583,9 +1564,9 @@ namespace BizHawk.Client.EmuHawk // // BranchesMarkersSplit.Panel2 // - this.BranchesMarkersSplit.Panel2.Controls.Add(this.groupBox1); - this.BranchesMarkersSplit.Size = new System.Drawing.Size(204, 404); - this.BranchesMarkersSplit.SplitterDistance = 179; + this.BranchesMarkersSplit.Panel2.Controls.Add(this.MarkerControl); + this.BranchesMarkersSplit.Size = new System.Drawing.Size(200, 412); + this.BranchesMarkersSplit.SplitterDistance = 184; this.BranchesMarkersSplit.TabIndex = 9; this.BranchesMarkersSplit.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.BranchesMarkersSplit_SplitterMoved); // @@ -1614,7 +1595,8 @@ namespace BizHawk.Client.EmuHawk // TAStudio // this.AllowDrop = true; - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(509, 576); this.Controls.Add(this.MainVertialSplit); this.Controls.Add(this.TasStatusStrip); @@ -1637,7 +1619,6 @@ namespace BizHawk.Client.EmuHawk this.TasStatusStrip.ResumeLayout(false); this.TasStatusStrip.PerformLayout(); this.RightClickMenu.ResumeLayout(false); - this.groupBox1.ResumeLayout(false); this.BranchesMarkersSplit.Panel1.ResumeLayout(false); this.BranchesMarkersSplit.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.BranchesMarkersSplit)).EndInit(); @@ -1739,7 +1720,6 @@ namespace BizHawk.Client.EmuHawk private System.Windows.Forms.ToolStripSeparator toolStripSeparator19; private System.Windows.Forms.ToolStripSeparator toolStripSeparator21; private System.Windows.Forms.ToolStripMenuItem DefaultStateSettingsMenuItem; - private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.ToolStripMenuItem CancelSeekContextMenuItem; private System.Windows.Forms.ToolStripSeparator StartFromNowSeparator; private System.Windows.Forms.ToolStripMenuItem StartNewProjectFromNowMenuItem;