From b967e6028db5b8cec2007febc41a11a34bdd8957 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Wed, 23 Nov 2022 02:48:35 +1000 Subject: [PATCH] Fix inconsistent application of colours from GTK theme, if available still no idea why I can set dark theme on Ubuntu but not Manjaro, but now menus won't use a white-to-black gradient with white text --- src/BizHawk.Client.EmuHawk/FormBase.cs | 3 +-- .../MenuEx/LinuxColorTable.cs | 16 ---------------- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 src/BizHawk.WinForms.Controls/MenuEx/LinuxColorTable.cs diff --git a/src/BizHawk.Client.EmuHawk/FormBase.cs b/src/BizHawk.Client.EmuHawk/FormBase.cs index aafd08ead2..950dbee6d0 100644 --- a/src/BizHawk.Client.EmuHawk/FormBase.cs +++ b/src/BizHawk.Client.EmuHawk/FormBase.cs @@ -7,7 +7,6 @@ using System.Windows.Forms; using BizHawk.Client.Common; using BizHawk.Common; -using BizHawk.WinForms.Controls; namespace BizHawk.Client.EmuHawk { @@ -31,7 +30,7 @@ namespace BizHawk.Client.EmuHawk } } - public static readonly ToolStripRenderer GlobalToolStripRenderer = new ToolStripProfessionalRenderer(new LinuxColorTable()); + public static readonly ToolStripSystemRenderer GlobalToolStripRenderer = new(); private string? _windowTitleStatic; diff --git a/src/BizHawk.WinForms.Controls/MenuEx/LinuxColorTable.cs b/src/BizHawk.WinForms.Controls/MenuEx/LinuxColorTable.cs deleted file mode 100644 index bca3fab482..0000000000 --- a/src/BizHawk.WinForms.Controls/MenuEx/LinuxColorTable.cs +++ /dev/null @@ -1,16 +0,0 @@ -#nullable enable - -using System.Drawing; -using System.Windows.Forms; - -namespace BizHawk.WinForms.Controls -{ - public sealed class LinuxColorTable : ProfessionalColorTable - { - public override Color MenuStripGradientBegin { get; } = Color.WhiteSmoke; - - public override Color ToolStripDropDownBackground { get; } = Color.WhiteSmoke; - - public override Color ToolStripGradientEnd { get; } = Color.WhiteSmoke; - } -}