Make Treeview headings look correct in both light and dark modes. Make ordinary

ttk widgets respond to dark mode by using semantic color defaults.

1 files changed, 10 insertions, 0 deletions

diff --git a/macosx/tkMacOSXButton.c b/macosx/tkMacOSXButton.c
index a335703..0458a2c 100644
--- a/macosx/tkMacOSXButton.c
+++ b/macosx/tkMacOSXButton.c
@@ -770,6 +770,16 @@ TkMacOSXDrawButton(
             hiinfo.animation.time.start = hiinfo.animation.time.current;
         }
 
+	/*
+	 * To avoid buttons with white text on a white background, we always
+	 * set the state to inactive in Dark Mode.  It isn't perfect but
+	 * it is usable.  Using a ttk::button would be a better choice,
+	 * however.
+	 */
+
+	if (TkMacOSXInDarkMode(butPtr->tkwin)) {
+	    hiinfo.state = kThemeStateInactive;
+	}
 	HIThemeDrawButton(&cntrRect, &hiinfo, dc.context, kHIThemeOrientationNormal,
 			  &contHIRec);