Fix dialog coloring

Author: facelessuser

rummage/lib/gui/dialogs/rummage_dialog.py

@@ -478,7 +478,9 @@ def update_tab_page_colors(self):
             if util.platform() == "macos" and not util.MAC_OLD:
                 color = Color.from_wxbgr(bg.GetRGB())
                 factor = util.MAC_LIGHT if color.luminance() > 0.5 else util.MAC_DARK
-                color.set('lab-d65.lightness', lambda l, f=factor: l + (100.0 * f) - 100.0)
+                color.set('alpha', 1.0).mix(
+                    'black' if color.luminance() > 0.5 else 'white', factor, space='srgb', in_place=True
+                ).set('alpha', 1.0)
                 bg.SetRGB(color.to_wxbgr())
             page.SetBackgroundColour(bg)
             if x == 0:

rummage/lib/gui/dialogs/settings_dialog.py

@@ -200,7 +200,9 @@ def update_tab_page_colors(self):
             if util.platform() == "macos" and not util.MAC_OLD:
                 color = Color.from_wxbgr(bg.GetRGB())
                 factor = util.MAC_LIGHT if color.luminance() > 0.5 else util.MAC_DARK
-                color.set('lab-d65.lightness', lambda l, f=factor: l + (100.0 * f) - 100.0)
+                color.set('alpha', 1.0).mix(
+                    'black' if color.luminance() > 0.5 else 'white', factor, space='srgb', in_place=True
+                ).set('alpha', 1.0)
                 bg.SetRGB(color.to_wxbgr())
             page.SetBackgroundColour(bg)
             if x == 0 and util.platform() != "linux":

rummage/lib/gui/util/__init__.py

@@ -22,18 +22,8 @@
 
 # High Sierra and below
 MAC_OLD = _MAC_VER < (10, 14)
-MAC_TAHOE = _MAC_VER >= (26, 0)
-
-if MAC_TAHOE:
-    MAC_LIGHT = 0.98
-    MAC_DARK = 1.09
-elif WX_420:
-    MAC_LIGHT = 1.023
-    MAC_DARK = 1.043
-else:
-    MAC_LIGHT = 0.99
-    MAC_DARK = 1.085
-
+MAC_LIGHT = 0.025
+MAC_DARK = 0.075
 
 def mac_ver():
     """Get macOS version."""