removed dark detect, improved button colouring

Author: Felix-Mallinder

Python_Engine/Python/pyproject.toml

@@ -16,7 +16,6 @@ dependencies = [
     "pytest-cov>=6.0.0",
     "pytest-order",
     "virtualenv",
-    "darkdetect"
 ]
 
 [urls]

Python_Engine/Python/src/python_toolkit/bhom/bhom_dark_theme.tcl

@@ -32,7 +32,7 @@ namespace eval ttk::theme::bhom_dark {
         -disabled-fg    "#666666"
         -inputbg        "#2d2d2d"
         -inputfg        "#ffffff"
-        -hover-bg       "#2a2d2e"
+        -hover-bg       "#424242"
         -active-bg      "#383838"
         -text-secondary "#999999"
     }
@@ -159,20 +159,20 @@ namespace eval ttk::theme::bhom_dark {
 
         ttk::style map TButton \
             -background [list \
-                active $colors(-primary-hover) \
+                active $colors(-hover-bg) \
                 pressed $colors(-active-bg) \
                 disabled $colors(-disabled-bg)] \
             -foreground [list \
                 active $colors(-fg) \
                 disabled $colors(-disabled-fg)] \
             -bordercolor [list \
-                active $colors(-primary-hover) \
+                active $colors(-hover-bg) \
                 disabled $colors(-border)] \
             -lightcolor [list \
-                active $colors(-primary-hover) \
+                active $colors(-hover-bg) \
                 pressed $colors(-active-bg)] \
             -darkcolor [list \
-                active $colors(-primary-hover) \
+                active $colors(-hover-bg) \
                 pressed $colors(-active-bg)] \
             -relief [list \
                 pressed sunken]

Python_Engine/Python/src/python_toolkit/bhom/bhom_light_theme.tcl

@@ -32,7 +32,7 @@ namespace eval ttk::theme::bhom_light {
         -disabled-fg    "#999999"
         -inputbg        "#ffffff"
         -inputfg        "#1a1a1a"
-        -hover-bg       "#f5f5f5"
+        -hover-bg       "#e0e0e0"
         -active-bg      "#ececec"
         -text-secondary "#666666"
     }
@@ -159,20 +159,20 @@ namespace eval ttk::theme::bhom_light {
 
         ttk::style map TButton \
             -background [list \
-                active $colors(-primary-hover) \
+                active $colors(-hover-bg) \
                 pressed $colors(-active-bg) \
                 disabled $colors(-disabled-bg)] \
             -foreground [list \
                 active $colors(-fg) \
                 disabled $colors(-disabled-fg)] \
             -bordercolor [list \
-                active $colors(-primary-hover) \
+                active $colors(-hover-bg) \
                 disabled $colors(-border)] \
             -lightcolor [list \
-                active $colors(-primary-hover) \
+                active $colors(-hover-bg) \
                 pressed $colors(-active-bg)] \
             -darkcolor [list \
-                active $colors(-primary-hover) \
+                active $colors(-hover-bg) \
                 pressed $colors(-active-bg)] \
             -relief [list \
                 pressed sunken]
@@ -195,11 +195,14 @@ namespace eval ttk::theme::bhom_light {
                 pressed $colors(-primary-hover) \
                 disabled $colors(-disabled-bg)] \
             -lightcolor [list \
-                active $colors(-primary-light) \
+                active $colors(-primary-hover) \
                 pressed $colors(-primary-hover)] \
             -darkcolor [list \
                 active $colors(-primary-hover) \
                 pressed $colors(-primary-hover)] \
+            -foreground [list \
+                active "#ffffff" \
+                disabled $colors(-disabled-fg)] \
             -relief [list \
                 pressed sunken]
 

Python_Engine/Python/src/python_toolkit/bhom_tkinter/bhom_base_window.py

@@ -5,7 +5,6 @@
 from python_toolkit.bhom_tkinter.widgets.label import Label
 from pathlib import Path
 from typing import Optional, Callable, Literal, List
-import darkdetect 
 import platform
 import ctypes
 import os
@@ -236,8 +235,9 @@ def _determine_theme(
             return theme_path_dark, dark_logo_path, dark_icon_path, "dark"
 
         #case == auto - detect system theme preference
-        if darkdetect.isDark():
+        if self._is_windows_dark_mode():
             return theme_path_dark, dark_logo_path, dark_icon_path, "dark"
+        
         else:
             return theme_path_light, logo_path, icon_path, "light"
 
@@ -336,6 +336,27 @@ def _load_theme(self, _theme_path: Path) -> str:
             except Exception:
                 return "default"
 
+    def _is_windows_dark_mode(self) -> bool:
+        
+        try:
+            
+            import winreg
+            key = winreg.OpenKey(
+				winreg.HKEY_CURRENT_USER,
+				r"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize"
+			)
+            value, _ = winreg.QueryValueEx(key, "AppsUseLightTheme")
+
+            return value == 0 # 0 means dark mode, 1 means light mode
+        
+        except FileNotFoundError:
+			# Key may not exist on older Windows versions
+            return False
+        
+        except ImportError:
+            # winreg is only available on Windows
+            return False
+
     def _ensure_typography_styles(self, style: ttk.Style) -> None:
         """Ensure key typography styles exist and remain visually distinct."""
         defaults = {
@@ -660,7 +681,7 @@ def _on_close_window(self, callback: Optional[Callable]) -> None:
 
     test = BHoMBaseWindow(
         title="Test Window",
-        theme_mode="dark",
+        theme_mode="light",
     )
 
     test.widgets.append(Label(test.content_frame, text="Hello, World!"))

Python_Engine/Python/src/python_toolkit/bhom_tkinter/widgets/button.py

@@ -85,4 +85,3 @@ def demo_action():
 	widget.build()
 
 	root.mainloop()
-