Merge pull request #1860 from Krypton-Suite/1399-bug-ribbon-tab-text-…

…o2k10-colours-V85 * #1399 for V85
Krypton-Suite · Nov 16, 2024 · b15f035 · b15f035
2 parents 86ce779 + a912af6
commit b15f035
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 17 deletions.
diff --git a/Assets/PNG/NuGet Package Icons/Krypton LTS.png b/Assets/PNG/NuGet Package Icons/Krypton LTS.png
diff --git a/Documents/Help/Changelog.md b/Documents/Help/Changelog.md
@@ -2,8 +2,9 @@
 
 =======
 
-# 2025-02-01 - Build 2502 (Patch 5) - Fefruary 2025
+# 2025-02-01 - Build 2502 (Patch 5) - February 2025
 * Resolved [#1842](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1842), `KryptonTextBox` height collapses when MultiLine is enabled.
+* Resolved [#1399](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1399), Hard coded colour setting removed from the `KryptonRibbonTab`.
 
 =======
 

diff --git a/Krypton.png b/Krypton.png
diff --git a/Source/Krypton Components/Krypton.Ribbon/Palette/PaletteRibbonContextDouble.cs b/Source/Krypton Components/Krypton.Ribbon/Palette/PaletteRibbonContextDouble.cs
@@ -180,22 +180,25 @@ public Color GetRibbonBackColor5(PaletteState state)
         /// <returns>Color value.</returns>
         public Color GetRibbonTextColor(PaletteState state)
         {
-            Color retColor = _inherit.GetRibbonTextColor(state);
-
-            // If empty then try and recover the context specific color
-            if (retColor == Color.Empty)
-            {
-                retColor = CheckForContextColor();
-            }
-            else if ((state == PaletteState.Normal) && LightBackground)
-            {
-                // With a light background we force the color to be dark in normal state so it stands out
-                return Color.FromArgb(Math.Min(retColor.R, (byte)60),
-                                      Math.Min(retColor.G, (byte)60),
-                                      Math.Min(retColor.B, (byte)60));
-            }
-
-            return retColor;
+            return _inherit.GetRibbonTextColor(state);
+
+            // #1399 Disable this override on the theme color arrays and accepting the normal return color
+            // The approach below goes outside of the theme color array and causes problems.
+
+            //// If empty then try and recover the context specific color
+            //if (retColor == Color.Empty)
+            //{
+            //    retColor = CheckForContextColor();
+            //}
+            //else if ((state == PaletteState.Normal) && LightBackground)
+            //{
+            //    // With a light background we force the color to be dark in normal state so it stands out
+            //    return Color.FromArgb(Math.Min(retColor.R, (byte)60),
+            //                          Math.Min(retColor.G, (byte)60),
+            //                          Math.Min(retColor.B, (byte)60));
+            //}
+
+            //return retColor;
         }
         #endregion