Bug 1863691 - Use non-deprecated system colors for menus on macOS. r=…

…mac-reviewers,spohl Also remove some no-longer-used or hard-coded system colors. Differential Revision: https://phabricator.services.mozilla.com/D193059
mozilla · Nov 15, 2023 · ff5ed15 · ff5ed15
1 parent 31b42b6
commit ff5ed15
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 49 deletions.
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
@@ -13,7 +13,7 @@
   --arrowpanel-field-background: light-dark(rgba(249, 249, 250, .3), rgba(12, 12, 13, .3));
 
   --sidebar-border-color: hsla(240, 5%, 5%, .1);
-  --sidebar-background-color: -moz-mac-source-list;
+  --sidebar-background-color: light-dark(#f6f6f6, #2d2d2d);
 }
 
 #browser,

diff --git a/servo/components/style/values/specified/color.rs b/servo/components/style/values/specified/color.rs
@@ -308,14 +308,6 @@ pub enum SystemColor {
     /// Text color of disabled text on toolbars.
     MozMacDisabledtoolbartext,
 
-    MozMacMenupopup,
-    MozMacMenuitem,
-    MozMacActiveMenuitem,
-    MozMacSourceList,
-    MozMacSourceListSelection,
-    MozMacActiveSourceListSelection,
-    MozMacTooltip,
-
     /// Theme accent color.
     /// https://drafts.csswg.org/css-color-4/#valdef-system-color-accentcolor
     Accentcolor,

diff --git a/widget/cocoa/nsLookAndFeel.mm b/widget/cocoa/nsLookAndFeel.mm
@@ -130,18 +130,17 @@ static nscolor GetColorFromNSColorWithCustomAlpha(NSColor* aColor,
     case ColorID::MozMenuhoverdisabled:
       aColor = NS_TRANSPARENT;
       break;
-    case ColorID::MozMenuhover:
-      color = GetColorFromNSColor(NSColor.selectedMenuItemColor);
-      break;
-    case ColorID::MozMenuhovertext:
-      color = GetColorFromNSColor(NSColor.selectedMenuItemTextColor);
+    case ColorID::Accentcolor:
+      color = GetColorFromNSColor(NSColor.controlAccentColor);
       break;
+    case ColorID::MozMenuhover:
     case ColorID::Selecteditem:
-      color = GetColorFromNSColor(NSColor.alternateSelectedControlColor);
+      color = GetColorFromNSColor(NSColor.selectedContentBackgroundColor);
       break;
     case ColorID::Accentcolortext:
+    case ColorID::MozMenuhovertext:
     case ColorID::Selecteditemtext:
-      color = GetColorFromNSColor(NSColor.alternateSelectedControlTextColor);
+      color = GetColorFromNSColor(NSColor.selectedMenuItemTextColor);
       break;
     case ColorID::IMESelectedRawTextBackground:
     case ColorID::IMESelectedConvertedTextBackground:
@@ -292,25 +291,6 @@ static nscolor GetColorFromNSColorWithCustomAlpha(NSColor* aColor,
     case ColorID::MozNativevisitedhyperlinktext:
       color = GetColorFromNSColor(NSColor.systemPurpleColor);
       break;
-    case ColorID::MozMacTooltip:
-    case ColorID::MozMacMenupopup:
-    case ColorID::MozMacMenuitem:
-      color = aScheme == ColorScheme::Light ? NS_RGB(0xf6, 0xf6, 0xf6)
-                                            : NS_RGB(0x28, 0x28, 0x28);
-      break;
-    case ColorID::MozMacSourceList:
-      color = aScheme == ColorScheme::Light ? NS_RGB(0xf6, 0xf6, 0xf6)
-                                            : NS_RGB(0x2d, 0x2d, 0x2d);
-      break;
-    case ColorID::MozMacSourceListSelection:
-      color = aScheme == ColorScheme::Light ? NS_RGB(0xd3, 0xd3, 0xd3)
-                                            : NS_RGB(0x2d, 0x2d, 0x2d);
-      break;
-    case ColorID::MozMacActiveMenuitem:
-    case ColorID::MozMacActiveSourceListSelection:
-    case ColorID::Accentcolor:
-      color = GetColorFromNSColor([NSColor controlAccentColor]);
-      break;
     case ColorID::MozHeaderbartext:
     case ColorID::MozHeaderbarinactivetext:
     case ColorID::Inactivecaptiontext:

diff --git a/widget/nsXPLookAndFeel.cpp b/widget/nsXPLookAndFeel.cpp
@@ -274,13 +274,6 @@ static const char sColorPrefs[][41] = {
     "ui.-moz-mac-defaultbuttontext",
     "ui.-moz-mac-focusring",
     "ui.-moz_mac_disabledtoolbartext",
-    "ui.-moz-mac-menupopup",
-    "ui.-moz-mac-menuitem",
-    "ui.-moz-mac-active-menuitem",
-    "ui.-moz-mac-source-list",
-    "ui.-moz-mac-source-list-selection",
-    "ui.-moz-mac-active-source-list-selection",
-    "ui.-moz-mac-tooltip",
     "ui.accentcolor",
     "ui.accentcolortext",
     "ui.-moz-autofill-background",
@@ -685,13 +678,6 @@ nscolor nsXPLookAndFeel::GetStandinForNativeColor(ColorID aID,
       COLOR(MozOddtreerow, 0xFF, 0xFF, 0xFF)
       COLOR(MozMacFocusring, 0x60, 0x9D, 0xD7)
       COLOR(MozMacDisabledtoolbartext, 0x3F, 0x3F, 0x3F)
-      COLOR(MozMacMenupopup, 0xe6, 0xe6, 0xe6)
-      COLOR(MozMacMenuitem, 0xe6, 0xe6, 0xe6)
-      COLOR(MozMacActiveMenuitem, 0x0a, 0x64, 0xdc)
-      COLOR(MozMacSourceList, 0xf7, 0xf7, 0xf7)
-      COLOR(MozMacSourceListSelection, 0xc8, 0xc8, 0xc8)
-      COLOR(MozMacActiveSourceListSelection, 0x0a, 0x64, 0xdc)
-      COLOR(MozMacTooltip, 0xf7, 0xf7, 0xf7)
       // Seems to be the default color (hardcoded because of bug 1065998)
       COLOR(MozNativehyperlinktext, 0x00, 0x66, 0xCC)
       COLOR(MozNativevisitedhyperlinktext, 0x55, 0x1A, 0x8B)