diff --git a/widget/cocoa/nsLookAndFeel.h b/widget/cocoa/nsLookAndFeel.h index 744372fc8b4cb..b0189c37b95b0 100644 --- a/widget/cocoa/nsLookAndFeel.h +++ b/widget/cocoa/nsLookAndFeel.h @@ -64,8 +64,7 @@ class nsLookAndFeel final : public nsXPLookAndFeel { nscolor mColorGrid; nscolor mColorActiveBorder; nscolor mColorGrayText; - nscolor mColorInactiveBorder; - nscolor mColorInactiveCaption; + nscolor mColorControlBackground; nscolor mColorScrollbar; nscolor mColorThreeDHighlight; nscolor mColorDialog; diff --git a/widget/cocoa/nsLookAndFeel.mm b/widget/cocoa/nsLookAndFeel.mm index 257273c52a07e..848cf651616e6 100644 --- a/widget/cocoa/nsLookAndFeel.mm +++ b/widget/cocoa/nsLookAndFeel.mm @@ -67,8 +67,7 @@ - (NSAppearanceName)bestMatchFromAppearancesWithNames:(NSArray mColorGrid(0), mColorActiveBorder(0), mColorGrayText(0), - mColorInactiveBorder(0), - mColorInactiveCaption(0), + mColorControlBackground(0), mColorScrollbar(0), mColorThreeDHighlight(0), mColorDialog(0), @@ -297,10 +296,8 @@ static nscolor GetColorFromNSColorWithAlpha(NSColor* aColor, float alpha) { aColor = mColorGrayText; break; case ColorID::Inactiveborder: - aColor = mColorInactiveBorder; - break; case ColorID::Inactivecaption: - aColor = mColorInactiveCaption; + aColor = mColorControlBackground; break; case ColorID::Inactivecaptiontext: aColor = NS_RGB(0x45, 0x45, 0x45); @@ -697,7 +694,6 @@ static nscolor GetColorFromNSColorWithAlpha(NSColor* aColor, float alpha) { ColorID::Activeborder, ColorID::Graytext, ColorID::Inactiveborder, - ColorID::Inactivecaption, ColorID::Scrollbar, ColorID::Threedhighlight, ColorID::Fieldtext, @@ -785,9 +781,7 @@ static nscolor GetColorFromNSColorWithAlpha(NSColor* aColor, float alpha) { case ColorID::Graytext: return mColorGrayText; case ColorID::Inactiveborder: - return mColorInactiveBorder; - case ColorID::Inactivecaption: - return mColorInactiveCaption; + return mColorControlBackground; case ColorID::Scrollbar: return mColorScrollbar; case ColorID::Threedhighlight: @@ -883,8 +877,7 @@ static nscolor GetColorFromNSColorWithAlpha(NSColor* aColor, float alpha) { mColorActiveBorder = GetColorFromNSColor([NSColor keyboardFocusIndicatorColor]); NSColor* disabledColor = [NSColor disabledControlTextColor]; mColorGrayText = GetColorFromNSColorWithAlpha(disabledColor, [disabledColor alphaComponent]); - mColorInactiveBorder = GetColorFromNSColor([NSColor controlBackgroundColor]); - mColorInactiveCaption = GetColorFromNSColor([NSColor controlBackgroundColor]); + mColorControlBackground = GetColorFromNSColor([NSColor controlBackgroundColor]); mColorScrollbar = GetColorFromNSColor([NSColor scrollBarColor]); mColorThreeDHighlight = GetColorFromNSColor([NSColor highlightColor]); mColorDialog = GetColorFromNSColor([NSColor controlHighlightColor]);