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

fixed fixed font handling

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@5800 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
peterl%netscape.com
1998-07-17 05:49:03 +00:00
parent 22e8ae3d18
commit 19ed791fd0
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -576,7 +576,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a
case NS_STYLE_FONT_WEIGHT_BOLDER:
case NS_STYLE_FONT_WEIGHT_LIGHTER:
font->mFont.weight = (parentFont->mFont.weight + value);
font->mFixedFont.weight = (parentFont->mFont.weight + value);
font->mFixedFont.weight = (parentFont->mFixedFont.weight + value);
break;
}
}
@@ -617,7 +617,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a
if (parentFont->mFont.size > (nscoord)((float)normal.size * kFontScale[index]))
break;
font->mFont.size = (nscoord)((float)normal.size * kFontScale[index]);
font->mFixedFont.size = (nscoord)((float)normal.size * kFontScale[index]);
font->mFixedFont.size = (nscoord)((float)normalFixed.size * kFontScale[index]);
}
}
else if (ourFont->mSize.IsLengthUnit()) {
@@ -626,7 +626,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a
}
else if (ourFont->mSize.GetUnit() == eCSSUnit_Percent) {
font->mFont.size = (nscoord)((float)(parentFont->mFont.size) * ourFont->mSize.GetPercentValue());
font->mFixedFont.size = (nscoord)((float)(parentFont->mFont.size) * ourFont->mSize.GetPercentValue());
font->mFixedFont.size = (nscoord)((float)(parentFont->mFixedFont.size) * ourFont->mSize.GetPercentValue());
}
NS_IF_RELEASE(parentContext);