From fa1483351fb433be3e6e3f3e47da3b0f210cd613 Mon Sep 17 00:00:00 2001 From: spherallic Date: Tue, 2 May 2023 04:07:18 +0200 Subject: [PATCH] Fix waypoint colors not being customizable --- Source/Core/Windows/PreferencesForm.Designer.cs | 8 -------- Source/Core/Windows/PreferencesForm.cs | 7 +++++-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Source/Core/Windows/PreferencesForm.Designer.cs b/Source/Core/Windows/PreferencesForm.Designer.cs index 42c2445..5f50c5c 100644 --- a/Source/Core/Windows/PreferencesForm.Designer.cs +++ b/Source/Core/Windows/PreferencesForm.Designer.cs @@ -1964,7 +1964,6 @@ namespace CodeImp.DoomBuilder.Windows // nightscolormare8 // this.nightscolormare8.BackColor = System.Drawing.Color.Transparent; - this.nightscolormare8.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.nightscolormare8.Label = "Path color (Mare 8):"; this.nightscolormare8.Location = new System.Drawing.Point(207, 98); this.nightscolormare8.MaximumSize = new System.Drawing.Size(10000, 23); @@ -1976,7 +1975,6 @@ namespace CodeImp.DoomBuilder.Windows // nightscolormare7 // this.nightscolormare7.BackColor = System.Drawing.Color.Transparent; - this.nightscolormare7.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.nightscolormare7.Label = "Path color (Mare 7):"; this.nightscolormare7.Location = new System.Drawing.Point(207, 71); this.nightscolormare7.MaximumSize = new System.Drawing.Size(10000, 23); @@ -1988,7 +1986,6 @@ namespace CodeImp.DoomBuilder.Windows // nightscolormare6 // this.nightscolormare6.BackColor = System.Drawing.Color.Transparent; - this.nightscolormare6.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.nightscolormare6.Label = "Path color (Mare 6):"; this.nightscolormare6.Location = new System.Drawing.Point(207, 44); this.nightscolormare6.MaximumSize = new System.Drawing.Size(10000, 23); @@ -2000,7 +1997,6 @@ namespace CodeImp.DoomBuilder.Windows // nightscolormare5 // this.nightscolormare5.BackColor = System.Drawing.Color.Transparent; - this.nightscolormare5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.nightscolormare5.Label = "Path color (Mare 5):"; this.nightscolormare5.Location = new System.Drawing.Point(207, 17); this.nightscolormare5.MaximumSize = new System.Drawing.Size(10000, 23); @@ -2012,7 +2008,6 @@ namespace CodeImp.DoomBuilder.Windows // nightscolormare4 // this.nightscolormare4.BackColor = System.Drawing.Color.Transparent; - this.nightscolormare4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.nightscolormare4.Label = "Path color (Mare 4):"; this.nightscolormare4.Location = new System.Drawing.Point(15, 98); this.nightscolormare4.MaximumSize = new System.Drawing.Size(10000, 23); @@ -2024,7 +2019,6 @@ namespace CodeImp.DoomBuilder.Windows // nightscolormare3 // this.nightscolormare3.BackColor = System.Drawing.Color.Transparent; - this.nightscolormare3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.nightscolormare3.Label = "Path color (Mare 3):"; this.nightscolormare3.Location = new System.Drawing.Point(15, 71); this.nightscolormare3.MaximumSize = new System.Drawing.Size(10000, 23); @@ -2036,7 +2030,6 @@ namespace CodeImp.DoomBuilder.Windows // nightscolormare2 // this.nightscolormare2.BackColor = System.Drawing.Color.Transparent; - this.nightscolormare2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.nightscolormare2.Label = "Path color (Mare 2):"; this.nightscolormare2.Location = new System.Drawing.Point(15, 44); this.nightscolormare2.MaximumSize = new System.Drawing.Size(10000, 23); @@ -2048,7 +2041,6 @@ namespace CodeImp.DoomBuilder.Windows // nightscolormare1 // this.nightscolormare1.BackColor = System.Drawing.Color.Transparent; - this.nightscolormare1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.nightscolormare1.Label = "Path color (Mare 1):"; this.nightscolormare1.Location = new System.Drawing.Point(15, 17); this.nightscolormare1.MaximumSize = new System.Drawing.Size(10000, 23); diff --git a/Source/Core/Windows/PreferencesForm.cs b/Source/Core/Windows/PreferencesForm.cs index eb884a2..8dc5942 100644 --- a/Source/Core/Windows/PreferencesForm.cs +++ b/Source/Core/Windows/PreferencesForm.cs @@ -432,8 +432,11 @@ namespace CodeImp.DoomBuilder.Windows General.Colors.SetNiGHTSColor(6, nightscolormare7.Color); General.Colors.SetNiGHTSColor(7, nightscolormare8.Color); - //mxd - General.Settings.GZSynchCameras = cbSynchCameras.Checked; + General.Colors.WaypointColor = waypointcolor1.Color; + General.Colors.WaypointLoopColor = waypointcolor2.Color; + + //mxd + General.Settings.GZSynchCameras = cbSynchCameras.Checked; General.Settings.GZMaxDynamicLights = tbDynLightCount.Value; General.Settings.GZStretchView = cbStretchView.Checked; General.Settings.GZVertexScale2D = vertexScale.Value;