Bug 534174 - Hardcode the right color for -moz-mac-menutextdisable. [NSColor disabledControlTextColor] is too dark. r=josh

This commit is contained in:
Markus Stange 2009-12-30 16:23:56 +01:00
parent 1aa0e49964
commit 7fbfc77917
2 changed files with 3 additions and 2 deletions

View File

@ -262,7 +262,8 @@ nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor &aColor)
aColor = NS_RGB(0xA3,0xA3,0xA3);
break;
case eColor__moz_mac_menutextdisable:
aColor = GetColorFromNSColor([NSColor disabledControlTextColor]);
aColor = nsToolkit::OnSnowLeopardOrLater() ?
NS_RGB(0x88,0x88,0x88) : NS_RGB(0x98,0x98,0x98);
break;
case eColor__moz_mac_menutextselect:
aColor = GetColorFromNSColor([NSColor selectedMenuItemTextColor]);

View File

@ -75,7 +75,7 @@ var colors = {
"-moz-mac-focusring": ["rgb(83, 144, 210)", "rgb(95, 112, 130)", "rgb(63, 152, 221)", "rgb(108, 126, 141)"],
"-moz-mac-menuselect": ["rgb(115, 132, 153)", "rgb(127, 127, 127)", "rgb(56, 117, 215)", "rgb(255, 193, 31)", "rgb(243, 70, 72)", "rgb(255, 138, 34)", "rgb(102, 197, 71)", "rgb(140, 78, 184)"],
"-moz-mac-menushadow": ["rgb(163, 163, 163)"],
"-moz-mac-menutextdisable": ["rgb(127, 127, 127)"],
"-moz-mac-menutextdisable": ["rgb(152, 152, 152)", "rgb(136, 136, 136)"],
"-moz-mac-menutextselect": ["rgb(255, 255, 255)"],
"-moz-mac-disabledtoolbartext": ["rgb(63, 63, 63)"],
"-moz-mac-alternateprimaryhighlight": ["rgb(115, 132, 153)", "rgb(127, 127, 127)", "rgb(56, 117, 215)", "rgb(255, 193, 31)", "rgb(243, 70, 72)", "rgb(255, 138, 34)", "rgb(102, 197, 71)", "rgb(140, 78, 184)"],