diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index 012b5f8d8b..cfb73c15e6 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -143,6 +143,9 @@ public int DispRecx = 0; public int DispRecy = 48; public int DispRecanchor = 0; + public int DispMultix = 36; + public int DispMultiy = 0; + public int DispMultianchor = 0; public bool ForceGDI = false; public bool DisplayStatusBar = true; diff --git a/BizHawk.MultiClient/config/MessageConfig.Designer.cs b/BizHawk.MultiClient/config/MessageConfig.Designer.cs index 70c09c7b1e..939504a56c 100644 --- a/BizHawk.MultiClient/config/MessageConfig.Designer.cs +++ b/BizHawk.MultiClient/config/MessageConfig.Designer.cs @@ -80,6 +80,8 @@ this.LInputColorDialog = new System.Windows.Forms.ColorDialog(); this.MovieColorDialog = new System.Windows.Forms.ColorDialog(); this.MovieInputColorDialog = new System.Windows.Forms.ColorDialog(); + this.MultitrackRadio = new System.Windows.Forms.RadioButton(); + this.MultitrackLabel = new System.Windows.Forms.Label(); this.MessageTypeBox.SuspendLayout(); this.groupBox2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.XNumeric)).BeginInit(); @@ -100,6 +102,8 @@ // // MessageTypeBox // + this.MessageTypeBox.Controls.Add(this.MultitrackLabel); + this.MessageTypeBox.Controls.Add(this.MultitrackRadio); this.MessageTypeBox.Controls.Add(this.RerecLabel); this.MessageTypeBox.Controls.Add(this.RerecordsRadio); this.MessageTypeBox.Controls.Add(this.MessLabel); @@ -622,6 +626,28 @@ this.TL.UseVisualStyleBackColor = true; this.TL.Click += new System.EventHandler(this.TL_CheckedChanged); // + // MultitrackRadio + // + this.MultitrackRadio.AutoSize = true; + this.MultitrackRadio.Location = new System.Drawing.Point(6, 161); + this.MultitrackRadio.Name = "MultitrackRadio"; + this.MultitrackRadio.Size = new System.Drawing.Size(71, 17); + this.MultitrackRadio.TabIndex = 12; + this.MultitrackRadio.TabStop = true; + this.MultitrackRadio.Text = "Multitrack"; + this.MultitrackRadio.UseVisualStyleBackColor = true; + this.MultitrackRadio.CheckedChanged += new System.EventHandler(this.MultitrackRadio_CheckedChanged); + // + // MultitrackLabel + // + this.MultitrackLabel.Anchor = System.Windows.Forms.AnchorStyles.None; + this.MultitrackLabel.AutoSize = true; + this.MultitrackLabel.Location = new System.Drawing.Point(126, 163); + this.MultitrackLabel.Name = "MultitrackLabel"; + this.MultitrackLabel.Size = new System.Drawing.Size(49, 13); + this.MultitrackLabel.TabIndex = 13; + this.MultitrackLabel.Text = "255, 255"; + // // MessageConfig // this.AcceptButton = this.OK; @@ -706,5 +732,7 @@ private System.Windows.Forms.Panel MovieInputColor; private System.Windows.Forms.Label label12; private System.Windows.Forms.ColorDialog MovieInputColorDialog; + private System.Windows.Forms.Label MultitrackLabel; + private System.Windows.Forms.RadioButton MultitrackRadio; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/config/MessageConfig.cs b/BizHawk.MultiClient/config/MessageConfig.cs index b8c424273c..374114eb66 100644 --- a/BizHawk.MultiClient/config/MessageConfig.cs +++ b/BizHawk.MultiClient/config/MessageConfig.cs @@ -32,6 +32,8 @@ namespace BizHawk.MultiClient int LastInputColor = Global.Config.LastInputColor; int DispRecx = Global.Config.DispRecx; int DispRecy = Global.Config.DispRecy; + int DispMultix = Global.Config.DispMultix; + int DispMultiy = Global.Config.DispMultiy; int MessageColor = Global.Config.MessagesColor; int AlertColor = Global.Config.AlertMessageColor; @@ -43,6 +45,7 @@ namespace BizHawk.MultiClient int DispLaganchor = Global.Config.DispLaganchor; int DispInputanchor = Global.Config.DispInpanchor; int DispRecanchor = Global.Config.DispRecanchor; + int DispMultiAnchor = Global.Config.DispMultianchor; public Brush brush = Brushes.Black; int px = 0; @@ -169,6 +172,14 @@ namespace BizHawk.MultiClient py = DispRecy; SetAnchorRadio(DispRecanchor); } + else if (MultitrackRadio.Checked) + { + XNumeric.Value = DispMultix; + YNumeric.Value = DispMultiy; + px = DispMultix; + py = DispMultiy; + SetAnchorRadio(DispMultiAnchor); + } PositionPanel.Refresh(); XNumeric.Refresh(); @@ -188,6 +199,9 @@ namespace BizHawk.MultiClient Global.Config.DispInpy = DispInpy; Global.Config.DispRecx = DispRecx; Global.Config.DispRecy = DispRecy; + Global.Config.DispMultix = DispMultix; + Global.Config.DispMultiy = DispMultiy; + Global.Config.MessagesColor = MessageColor; Global.Config.AlertMessageColor = AlertColor; Global.Config.LastInputColor = LastInputColor; @@ -199,6 +213,7 @@ namespace BizHawk.MultiClient Global.Config.DispLaganchor = DispLaganchor; Global.Config.DispInpanchor = DispInputanchor; Global.Config.DispRecanchor = DispRecanchor; + Global.Config.DispMultianchor = DispMultiAnchor; } private void OK_Click(object sender, EventArgs e) @@ -232,12 +247,16 @@ namespace BizHawk.MultiClient SetPositionInfo(); } - private void RerecordsRadio_CheckedChanged(object sender, EventArgs e) { SetPositionInfo(); } + private void MultitrackRadio_CheckedChanged(object sender, EventArgs e) + { + SetPositionInfo(); + } + private void XNumericChange() { px = (int)XNumeric.Value; @@ -340,6 +359,11 @@ namespace BizHawk.MultiClient DispRecx = px; DispRecy = py; } + else if (MultitrackRadio.Checked) + { + DispMultix = px; + DispMultiy = py; + } FpsPosLabel.Text = DispFPSx.ToString() + ", " + DispFPSy.ToString(); FCLabel.Text = DispFrameCx.ToString() + ", " + DispFrameCy.ToString(); LagLabel.Text = DispLagx.ToString() + ", " + DispLagy.ToString();