зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1838460 - Remove unused moz-menubartext color. r=geckoview-reviewers,devtools-reviewers,nchevobbe,amejiamarmol
-moz-menubarhovertext has one usage that can go away once we remove windows 7 / 8 so not touching that yet. Depends on D182896 Differential Revision: https://phabricator.services.mozilla.com/D182897
This commit is contained in:
Родитель
9d5cae0403
Коммит
1b463368ae
|
@ -1489,15 +1489,6 @@ function getFixtureColorData() {
|
|||
hwg: "",
|
||||
cycle: false,
|
||||
},
|
||||
{
|
||||
authored: "-moz-menubartext",
|
||||
name: "",
|
||||
hex: "",
|
||||
hsl: "",
|
||||
rgb: "",
|
||||
hwg: "",
|
||||
cycle: false,
|
||||
},
|
||||
];
|
||||
}
|
||||
/* eslint-enable max-len */
|
||||
|
|
|
@ -59,7 +59,6 @@ function runTest(testCanvasColors) {
|
|||
[ "-moz-FieldText", 0x00, 0x00, 0x00 ],
|
||||
[ "-moz-MenuHover", 0x33, 0x99, 0xFF ],
|
||||
[ "-moz-MenuHoverText", 0x00, 0x00, 0x00 ],
|
||||
[ "-moz-MenubarText", 0x00, 0x00, 0x00 ],
|
||||
[ "-moz-MenubarHoverText", 0x00, 0x00, 0x00 ],
|
||||
[ "-moz-NativeHyperlinkText", 0x00, 0x66, 0xCC ],
|
||||
[ "-moz-OddTreeRow", 0xFF, 0xFF, 0xFF ],
|
||||
|
|
|
@ -228,8 +228,6 @@ pub enum SystemColor {
|
|||
MozMenuhoverdisabled,
|
||||
/// Used for menu item text when hovered.
|
||||
MozMenuhovertext,
|
||||
/// Used for menubar item text.
|
||||
MozMenubartext,
|
||||
/// Used for menubar item text when hovered.
|
||||
MozMenubarhovertext,
|
||||
|
||||
|
|
|
@ -119,10 +119,6 @@ nsresult nsLookAndFeel::NativeGetColor(ColorID aID, ColorScheme aColorScheme,
|
|||
switch (aID) {
|
||||
// These colors don't seem to be used for anything anymore in Mozilla
|
||||
// The CSS2 colors below are used.
|
||||
case ColorID::MozMenubartext:
|
||||
aColor = mSystemColors.colorForeground;
|
||||
break;
|
||||
|
||||
case ColorID::ThemedScrollbarThumbInactive:
|
||||
case ColorID::ThemedScrollbarThumb:
|
||||
// We don't need to care about the Active and Hover colors because Android
|
||||
|
|
|
@ -188,7 +188,6 @@ nsresult nsLookAndFeel::NativeGetColor(ColorID aID, ColorScheme aScheme, nscolor
|
|||
case ColorID::Captiontext:
|
||||
case ColorID::Menutext:
|
||||
case ColorID::Infotext:
|
||||
case ColorID::MozMenubartext:
|
||||
color = GetColorFromNSColor(NSColor.textColor);
|
||||
break;
|
||||
case ColorID::Windowtext:
|
||||
|
|
|
@ -266,7 +266,6 @@ static const char sColorPrefs[][41] = {
|
|||
"ui.-moz_menuhover",
|
||||
"ui.-moz_menuhoverdisabled",
|
||||
"ui.-moz_menuhovertext",
|
||||
"ui.-moz_menubartext",
|
||||
"ui.-moz_menubarhovertext",
|
||||
"ui.-moz_eventreerow",
|
||||
"ui.-moz_oddtreerow",
|
||||
|
@ -712,7 +711,6 @@ nscolor nsXPLookAndFeel::GetStandinForNativeColor(ColorID aID,
|
|||
COLOR(MozButtonactivetext, 0x00, 0x00, 0x00)
|
||||
COLOR(MozMenuhover, 0x33, 0x99, 0xFF)
|
||||
COLOR(MozMenuhovertext, 0x00, 0x00, 0x00)
|
||||
COLOR(MozMenubartext, 0x00, 0x00, 0x00)
|
||||
COLOR(MozMenubarhovertext, 0x00, 0x00, 0x00)
|
||||
COLOR(MozMenuhoverdisabled, 0xF0, 0xF0, 0xF0)
|
||||
COLOR(MozEventreerow, 0xFF, 0xFF, 0xFF)
|
||||
|
|
|
@ -78,7 +78,6 @@ var colors = {
|
|||
"-moz-mac-secondaryhighlight": ["rgb(212, 212, 212)"],
|
||||
"-moz-menuhover": ["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-menuhovertext": ["rgb(255, 255, 255)", "rgb(255, 254, 254)", "rgb(254, 255, 254)"],
|
||||
"-moz-menubartext": ["rgb(0, 0, 0)"],
|
||||
//"-moz-menubarhovertext": ["rgb(255, 255, 255)"],
|
||||
"-moz-oddtreerow": ["rgb(236, 242, 254)", "rgb(240, 240, 240)", "rgb(243, 245, 250)", "rgb(243, 246, 250)", "rgb(245, 245, 245)"],
|
||||
"-moz-visitedhyperlinktext": ["rgb(85, 26, 139)"],
|
||||
|
|
|
@ -88,7 +88,6 @@ nsresult nsLookAndFeel::NativeGetColor(ColorID, ColorScheme, nscolor& aResult) {
|
|||
case ColorID::Captiontext:
|
||||
case ColorID::Menutext:
|
||||
case ColorID::Infotext:
|
||||
case ColorID::MozMenubartext:
|
||||
case ColorID::Windowtext:
|
||||
aResult = mColorDarkText;
|
||||
break;
|
||||
|
|
|
@ -322,7 +322,6 @@ nsresult nsLookAndFeel::NativeGetColor(ColorID aID, ColorScheme aScheme,
|
|||
idx = COLOR_MENU;
|
||||
break;
|
||||
case ColorID::Menutext:
|
||||
case ColorID::MozMenubartext:
|
||||
if (UseNonNativeMenuColors(aScheme)) {
|
||||
aColor = kNonNativeMenuText;
|
||||
return NS_OK;
|
||||
|
|
Загрузка…
Ссылка в новой задаче