From d978e2c629c79f12a0bf85f1dd542a9d52b8cfde Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 3 May 2014 01:59:49 +0000 Subject: [PATCH] Atari 2600 - make background setting a color instead of number, in order to get a color picker in the settings dialog --- .../Consoles/Atari/2600/Atari2600.Settings.cs | 6 +++--- BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/TIA.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.Settings.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.Settings.cs index 5796820805..1acf0bf35a 100644 --- a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.Settings.cs +++ b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.Settings.cs @@ -1,6 +1,6 @@ using System; using System.ComponentModel; - +using System.Drawing; using Newtonsoft.Json; namespace BizHawk.Emulation.Cores.Atari.Atari2600 @@ -88,7 +88,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 set { this._palBottomLine = Math.Min(310, Math.Max(value, 192)); } } - public int BackgroundColor { get; set; } + public Color BackgroundColor { get; set; } public A2600Settings Clone() { @@ -106,7 +106,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 ShowMissle2 = true, ShowBall = true, ShowPlayfield = true, - BackgroundColor = 0 + BackgroundColor = Color.Black }; } } diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/TIA.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/TIA.cs index bd79a7f975..4b7da83ff2 100644 --- a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/TIA.cs +++ b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/TIA.cs @@ -124,7 +124,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 public int BackgroundColor { - get { return _core.Settings.BackgroundColor; } + get { return _core.Settings.BackgroundColor.ToArgb(); } } public int[] GetVideoBuffer()