From aaa75097005d38fada2f6bdf487ef473932e3674 Mon Sep 17 00:00:00 2001
From: MineBill <minebill@protonmail.com>
Date: Mon, 27 Jan 2025 17:05:37 +0200
Subject: [PATCH] Added a new 'TextDisabled' color option for disabled text.

---
 BeefLibs/Beefy2D/src/theme/dark/DarkMenu.bf  | 13 +++++--------
 BeefLibs/Beefy2D/src/theme/dark/DarkTheme.bf |  1 +
 IDE/src/Settings.bf                          |  3 +++
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/BeefLibs/Beefy2D/src/theme/dark/DarkMenu.bf b/BeefLibs/Beefy2D/src/theme/dark/DarkMenu.bf
index 434cab94..d0b826eb 100644
--- a/BeefLibs/Beefy2D/src/theme/dark/DarkMenu.bf
+++ b/BeefLibs/Beefy2D/src/theme/dark/DarkMenu.bf
@@ -32,7 +32,7 @@ namespace Beefy.theme.dark
 				let darkMenuWidget = (DarkMenuWidget)mMenuWidget;
 				g.SetFont(mMenuItem.mBold ? darkMenuWidget.mBoldFont : darkMenuWidget.mFont);
 
-				using (g.PushColor(mMenuItem.mDisabled ? 0xFFA8A8A8 : 0xFFFFFFFF))
+				using (g.PushColor(mMenuItem.mDisabled ? DarkTheme.COLOR_TEXT_DISABLED : DarkTheme.COLOR_TEXT))
 				{
 					StringView leftStr = mMenuItem.mLabel;
 					StringView rightStr = default;
@@ -43,12 +43,9 @@ namespace Beefy.theme.dark
 						leftStr.RemoveToEnd(barIdx);
 					}
 
-					using (g.PushColor(DarkTheme.COLOR_TEXT))
-					{
-						g.DrawString(leftStr, GS!(36), 0);
-						if (!rightStr.IsEmpty)
-							g.DrawString(rightStr, mWidth - GS!(8), 0, .Right);
-					}
+					g.DrawString(leftStr, GS!(36), 0);
+					if (!rightStr.IsEmpty)
+						g.DrawString(rightStr, mWidth - GS!(8), 0, .Right);
 				}
 
                 if (mMenuItem.mIconImage != null)
@@ -57,7 +54,7 @@ namespace Beefy.theme.dark
 
             if (mMenuItem.IsParent)
             {
-				using (g.PushColor(mMenuItem.mDisabled ? 0xFFA8A8A8 : 0xFFFFFFFF))
+				using (g.PushColor(mMenuItem.mDisabled ? DarkTheme.COLOR_TEXT_DISABLED : DarkTheme.COLOR_TEXT))
                 	g.Draw(DarkTheme.sDarkTheme.GetImage(DarkTheme.ImageIdx.RightArrow), mWidth - GS!(16), 0);
             }
         }
diff --git a/BeefLibs/Beefy2D/src/theme/dark/DarkTheme.bf b/BeefLibs/Beefy2D/src/theme/dark/DarkTheme.bf
index 97225b72..88473331 100644
--- a/BeefLibs/Beefy2D/src/theme/dark/DarkTheme.bf
+++ b/BeefLibs/Beefy2D/src/theme/dark/DarkTheme.bf
@@ -197,6 +197,7 @@ namespace Beefy.theme.dark
         };
 
 		public static uint32 COLOR_TEXT                   = 0xFFFFFFFF;
+		public static uint32 COLOR_TEXT_DISABLED          = 0xFFA8A8A8;
         public static uint32 COLOR_WINDOW                 = 0xFF595962;
         public static uint32 COLOR_BKG                    = 0xFF26262A;
         public static uint32 COLOR_SELECTED_OUTLINE       = 0xFFCFAE11;
diff --git a/IDE/src/Settings.bf b/IDE/src/Settings.bf
index 6f512a68..13a2dd00 100644
--- a/IDE/src/Settings.bf
+++ b/IDE/src/Settings.bf
@@ -311,6 +311,7 @@ namespace IDE
 		public class Colors
 		{
 			public Color mText = 0xFFFFFFFF;
+			public Color mTextDisabled = 0xFFA8A8A8;
 			public Color mWindow = 0xFF44444D;
 			public Color mBackground = 0xFF1C1C24;
 			public Color mSelectedOutline = 0xFFCFAE11;
@@ -364,6 +365,7 @@ namespace IDE
 				}
 
 				GetColor("Text", ref mText);
+				GetColor("TextDisabled", ref mTextDisabled);
 				GetColor("Window", ref mWindow);
 				GetColor("Background", ref mBackground);
 				GetColor("SelectedOutline", ref mSelectedOutline);
@@ -450,6 +452,7 @@ namespace IDE
 				SourceEditWidgetContent.sTextColors[(.)SourceElementType.VisibleWhiteSpace] = mVisibleWhiteSpace;
 
 				DarkTheme.COLOR_TEXT = mText;
+				DarkTheme.COLOR_TEXT_DISABLED = mTextDisabled;
 				DarkTheme.COLOR_WINDOW = mWindow;
 				DarkTheme.COLOR_BKG = mBackground;
 				DarkTheme.COLOR_SELECTED_OUTLINE = mSelectedOutline;