Bug 468498 - Add color -moz-mac-disabledtoolbartext for disabled text in toolbars. r=roc

This commit is contained in:
Markus Stange 2008-12-09 17:48:51 +01:00
Родитель 386dee36ac
Коммит 9a6be32faf
4 изменённых файлов: 6 добавлений и 0 удалений

Просмотреть файл

@ -146,6 +146,7 @@ CSS_KEY(-moz-mac-menuselect, _moz_mac_menuselect)
CSS_KEY(-moz-mac-menushadow, _moz_mac_menushadow)
CSS_KEY(-moz-mac-menutextdisable, _moz_mac_menutextdisable)
CSS_KEY(-moz-mac-menutextselect, _moz_mac_menutextselect)
CSS_KEY(-moz-mac-disabledtoolbartext, _moz_mac_disabledtoolbartext)
CSS_KEY(-moz-mac-secondaryhighlight, _moz_mac_secondaryhighlight)
CSS_KEY(-moz-malayalam, _moz_malayalam)
CSS_KEY(-moz-marker, _moz_marker) // Disabled because not supported correctly.

Просмотреть файл

@ -477,6 +477,7 @@ const PRInt32 nsCSSProps::kColorKTable[] = {
eCSSKeyword__moz_mac_menushadow, nsILookAndFeel::eColor__moz_mac_menushadow,
eCSSKeyword__moz_mac_menutextdisable, nsILookAndFeel::eColor__moz_mac_menutextdisable,
eCSSKeyword__moz_mac_menutextselect, nsILookAndFeel::eColor__moz_mac_menutextselect,
eCSSKeyword__moz_mac_disabledtoolbartext, nsILookAndFeel::eColor__moz_mac_disabledtoolbartext,
eCSSKeyword__moz_mac_accentlightesthighlight, nsILookAndFeel::eColor__moz_mac_accentlightesthighlight,
eCSSKeyword__moz_mac_accentregularhighlight, nsILookAndFeel::eColor__moz_mac_accentregularhighlight,
eCSSKeyword__moz_mac_accentface, nsILookAndFeel::eColor__moz_mac_accentface,

Просмотреть файл

@ -151,6 +151,7 @@ public:
eColor__moz_mac_menushadow, //colour used to do shadows on menu items
eColor__moz_mac_menutextdisable, // color used to display text for disabled menu items
eColor__moz_mac_menutextselect, //colour used to display text while mouse is over a menu item
eColor__moz_mac_disabledtoolbartext, // text color of disabled text on toolbars
//all of the accent colours
eColor__moz_mac_accentlightesthighlight,

Просмотреть файл

@ -314,6 +314,9 @@ nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor &aColor)
case eColor__moz_mac_menutextselect:
res = GetMacTextColor(kThemeTextColorMenuItemSelected, aColor, NS_RGB(0xFF,0xFF,0xFF));
break;
case eColor__moz_mac_disabledtoolbartext:
aColor = NS_RGB(0x3F,0x3F,0x3F);
break;
case eColor__moz_mac_accentlightesthighlight:
//get this colour by querying variation table, ows. default to Platinum/Lavendar
res = GetMacAccentColor(eColorOffset_mac_accentlightesthighlight, aColor, NS_RGB(0xEE,0xEE,0xEE));