Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix related to the reconstruction of html.css (#6625) and to css system fonts (#1021): in quirks mode and on each platform, use the same fonts as Nav4 for edit fields, lists and buttons. r=rods a=buster

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@79754 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pierre%netscape.com
2000-09-21 10:21:23 +00:00
parent 290d99a73b
commit 7598a7ebfc
3 changed files with 123 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
mozilla/content/html/style/src/nsCSSStyleRule.cpp
View File

@@ -1648,6 +1648,7 @@ MapDeclarationFontInto(nsICSSDeclaration* aDeclaration,
if (dc) {
SystemAttrStruct sysInfo;
sysInfo.mFont = &font->mFont;
font->mFont.size = defaultFont.size; // GetSystemAttribute sets the font face but not necessarily the size
if (NS_FAILED(dc->GetSystemAttribute(sysID, &sysInfo))) {
font->mFont.name = defaultFont.name;
font->mFixedFont.name = defaultFixedFont.name;
@@ -1657,12 +1658,47 @@ MapDeclarationFontInto(nsICSSDeclaration* aDeclaration,
// NavQuirks uses sans-serif instead of whatever the native font is
if (eCompatibility_NavQuirks == mode) {
if (sysID == eSystemAttr_Font_Field) {
font->mFont.name.AssignWithConversion("monospace");
} else if (sysID == eSystemAttr_Font_Button ||
sysID == eSystemAttr_Font_Caption) {
font->mFont.name.AssignWithConversion("sans-serif");
#ifdef XP_MAC
switch (sysID) {
case eSystemAttr_Font_Field:
case eSystemAttr_Font_List:
font->mFont.name.AssignWithConversion("monospace");
font->mFont.size = defaultFixedFont.size;
break;
case eSystemAttr_Font_Button:
font->mFont.name.AssignWithConversion("serif");
font->mFont.size = defaultFont.size;
break;
}
#endif
#ifdef XP_PC
switch (sysID) {
case eSystemAttr_Font_Field:
font->mFont.name.AssignWithConversion("monospace");
font->mFont.size = defaultFixedFont.size;
break;
case eSystemAttr_Font_Button:
case eSystemAttr_Font_List:
font->mFont.name.AssignWithConversion("sans-serif");
font->mFont.size = defaultFont.size;
break;
}
#endif
#ifdef XP_UNIX
switch (sysID) {
case eSystemAttr_Font_Field:
font->mFont.name.AssignWithConversion("monospace");
font->mFont.size = defaultFixedFont.size;
break;
case eSystemAttr_Font_Button:
case eSystemAttr_Font_List:
font->mFont.name.AssignWithConversion("serif");
font->mFont.size = defaultFont.size;
break;
}
#endif
}
}
else if (eCSSUnit_Inherit == ourFont->mFamily.GetUnit()) {

46
mozilla/layout/html/style/src/nsCSSStyleRule.cpp
View File

@@ -1648,6 +1648,7 @@ MapDeclarationFontInto(nsICSSDeclaration* aDeclaration,
if (dc) {
SystemAttrStruct sysInfo;
sysInfo.mFont = &font->mFont;
font->mFont.size = defaultFont.size; // GetSystemAttribute sets the font face but not necessarily the size
if (NS_FAILED(dc->GetSystemAttribute(sysID, &sysInfo))) {
font->mFont.name = defaultFont.name;
font->mFixedFont.name = defaultFixedFont.name;
@@ -1657,12 +1658,47 @@ MapDeclarationFontInto(nsICSSDeclaration* aDeclaration,
// NavQuirks uses sans-serif instead of whatever the native font is
if (eCompatibility_NavQuirks == mode) {
if (sysID == eSystemAttr_Font_Field) {
font->mFont.name.AssignWithConversion("monospace");
} else if (sysID == eSystemAttr_Font_Button ||
sysID == eSystemAttr_Font_Caption) {
font->mFont.name.AssignWithConversion("sans-serif");
#ifdef XP_MAC
switch (sysID) {
case eSystemAttr_Font_Field:
case eSystemAttr_Font_List:
font->mFont.name.AssignWithConversion("monospace");
font->mFont.size = defaultFixedFont.size;
break;
case eSystemAttr_Font_Button:
font->mFont.name.AssignWithConversion("serif");
font->mFont.size = defaultFont.size;
break;
}
#endif
#ifdef XP_PC
switch (sysID) {
case eSystemAttr_Font_Field:
font->mFont.name.AssignWithConversion("monospace");
font->mFont.size = defaultFixedFont.size;
break;
case eSystemAttr_Font_Button:
case eSystemAttr_Font_List:
font->mFont.name.AssignWithConversion("sans-serif");
font->mFont.size = defaultFont.size;
break;
}
#endif
#ifdef XP_UNIX
switch (sysID) {
case eSystemAttr_Font_Field:
font->mFont.name.AssignWithConversion("monospace");
font->mFont.size = defaultFixedFont.size;
break;
case eSystemAttr_Font_Button:
case eSystemAttr_Font_List:
font->mFont.name.AssignWithConversion("serif");
font->mFont.size = defaultFont.size;
break;
}
#endif
}
}
else if (eCSSUnit_Inherit == ourFont->mFamily.GetUnit()) {

46
mozilla/layout/style/nsCSSStyleRule.cpp
View File

@@ -1648,6 +1648,7 @@ MapDeclarationFontInto(nsICSSDeclaration* aDeclaration,
if (dc) {
SystemAttrStruct sysInfo;
sysInfo.mFont = &font->mFont;
font->mFont.size = defaultFont.size; // GetSystemAttribute sets the font face but not necessarily the size
if (NS_FAILED(dc->GetSystemAttribute(sysID, &sysInfo))) {
font->mFont.name = defaultFont.name;
font->mFixedFont.name = defaultFixedFont.name;
@@ -1657,12 +1658,47 @@ MapDeclarationFontInto(nsICSSDeclaration* aDeclaration,
// NavQuirks uses sans-serif instead of whatever the native font is
if (eCompatibility_NavQuirks == mode) {
if (sysID == eSystemAttr_Font_Field) {
font->mFont.name.AssignWithConversion("monospace");
} else if (sysID == eSystemAttr_Font_Button ||
sysID == eSystemAttr_Font_Caption) {
font->mFont.name.AssignWithConversion("sans-serif");
#ifdef XP_MAC
switch (sysID) {
case eSystemAttr_Font_Field:
case eSystemAttr_Font_List:
font->mFont.name.AssignWithConversion("monospace");
font->mFont.size = defaultFixedFont.size;
break;
case eSystemAttr_Font_Button:
font->mFont.name.AssignWithConversion("serif");
font->mFont.size = defaultFont.size;
break;
}
#endif
#ifdef XP_PC
switch (sysID) {
case eSystemAttr_Font_Field:
font->mFont.name.AssignWithConversion("monospace");
font->mFont.size = defaultFixedFont.size;
break;
case eSystemAttr_Font_Button:
case eSystemAttr_Font_List:
font->mFont.name.AssignWithConversion("sans-serif");
font->mFont.size = defaultFont.size;
break;
}
#endif
#ifdef XP_UNIX
switch (sysID) {
case eSystemAttr_Font_Field:
font->mFont.name.AssignWithConversion("monospace");
font->mFont.size = defaultFixedFont.size;
break;
case eSystemAttr_Font_Button:
case eSystemAttr_Font_List:
font->mFont.name.AssignWithConversion("serif");
font->mFont.size = defaultFont.size;
break;
}
#endif
}
}
else if (eCSSUnit_Inherit == ourFont->mFamily.GetUnit()) {