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

Fixed bug #3918 with measuring small-caps text; ported to use new line-layout API's

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@24319 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp%netscape.com
1999-03-18 21:02:40 +00:00
parent 0f0692af69
commit 7e25f9704c
2 changed files with 22 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
mozilla/layout/generic/nsTextFrame.cpp
View File

@@ -462,8 +462,8 @@ TextFrame::TextFrame()
// Create text timer the first time out
gTextBlinker = new BlinkTimer();
}
mSelectionOffset = -1;
mSelectionEnd = -1;
mSelectionOffset = PRUint32(-1);
mSelectionEnd = PRUint32(-1);
NS_ADDREF(gTextBlinker);
}
@@ -1211,28 +1211,20 @@ TextFrame::GetWidth(nsIRenderingContext& aRenderingContext,
nsIFontMetrics* lastFont = aTextStyle.mLastFont;
nscoord sum = 0;
PRInt32 pendingCount;
PRUnichar* runStart = bp;
nscoord charWidth;
for (; --aLength >= 0; aBuffer++) {
nsIFontMetrics* nextFont;
nscoord nextY, glyphWidth;
nscoord glyphWidth;
PRUnichar ch = *aBuffer;
if (aTextStyle.mSmallCaps && nsCRT::IsLower(ch)) {
nextFont = aTextStyle.mSmallFont;
ch = nsCRT::ToUpper(ch);
if (lastFont != aTextStyle.mSmallFont) {
aRenderingContext.SetFont(aTextStyle.mSmallFont);
aRenderingContext.GetWidth(ch, charWidth);
aRenderingContext.SetFont(aTextStyle.mNormalFont);
}
else {
aRenderingContext.GetWidth(ch, charWidth);
lastFont = aTextStyle.mSmallFont;
aRenderingContext.SetFont(lastFont);
}
aRenderingContext.GetWidth(ch, charWidth);
glyphWidth = charWidth + aTextStyle.mLetterSpacing;
}
else if (ch == ' ') {
nextFont = aTextStyle.mNormalFont;
glyphWidth = aTextStyle.mSpaceWidth + aTextStyle.mWordSpacing;
nscoord extra = aTextStyle.mExtraSpacePerSpace;
if (--aTextStyle.mNumSpaces == 0) {
@@ -1242,18 +1234,12 @@ TextFrame::GetWidth(nsIRenderingContext& aRenderingContext,
}
else {
if (lastFont != aTextStyle.mNormalFont) {
aRenderingContext.SetFont(aTextStyle.mNormalFont);
aRenderingContext.GetWidth(ch, charWidth);
aRenderingContext.SetFont(aTextStyle.mSmallFont);
lastFont = aTextStyle.mNormalFont;
aRenderingContext.SetFont(lastFont);
}
else {
aRenderingContext.GetWidth(ch, charWidth);
}
nextFont = aTextStyle.mNormalFont;
aRenderingContext.GetWidth(ch, charWidth);
glyphWidth = charWidth + aTextStyle.mLetterSpacing;
}
if (nextFont != lastFont)
lastFont = nextFont;
sum += glyphWidth;
*bp++ = ch;
}
@@ -2241,7 +2227,8 @@ TextFrame::Reflow(nsIPresContext& aPresContext,
PRInt32 column = lineLayout.GetColumn();
PRInt32 prevColumn = column;
mColumn = column;
PRBool breakable = 0 != lineLayout.GetPlacedFrames();
PRBool breakable = !lineLayout.LineIsEmpty();
for (;;) {
// Get next word/whitespace from the text
PRBool isWhitespace;

35
mozilla/layout/html/base/src/nsTextFrame.cpp
View File

@@ -462,8 +462,8 @@ TextFrame::TextFrame()
// Create text timer the first time out
gTextBlinker = new BlinkTimer();
}
mSelectionOffset = -1;
mSelectionEnd = -1;
mSelectionOffset = PRUint32(-1);
mSelectionEnd = PRUint32(-1);
NS_ADDREF(gTextBlinker);
}
@@ -1211,28 +1211,20 @@ TextFrame::GetWidth(nsIRenderingContext& aRenderingContext,
nsIFontMetrics* lastFont = aTextStyle.mLastFont;
nscoord sum = 0;
PRInt32 pendingCount;
PRUnichar* runStart = bp;
nscoord charWidth;
for (; --aLength >= 0; aBuffer++) {
nsIFontMetrics* nextFont;
nscoord nextY, glyphWidth;
nscoord glyphWidth;
PRUnichar ch = *aBuffer;
if (aTextStyle.mSmallCaps && nsCRT::IsLower(ch)) {
nextFont = aTextStyle.mSmallFont;
ch = nsCRT::ToUpper(ch);
if (lastFont != aTextStyle.mSmallFont) {
aRenderingContext.SetFont(aTextStyle.mSmallFont);
aRenderingContext.GetWidth(ch, charWidth);
aRenderingContext.SetFont(aTextStyle.mNormalFont);
}
else {
aRenderingContext.GetWidth(ch, charWidth);
lastFont = aTextStyle.mSmallFont;
aRenderingContext.SetFont(lastFont);
}
aRenderingContext.GetWidth(ch, charWidth);
glyphWidth = charWidth + aTextStyle.mLetterSpacing;
}
else if (ch == ' ') {
nextFont = aTextStyle.mNormalFont;
glyphWidth = aTextStyle.mSpaceWidth + aTextStyle.mWordSpacing;
nscoord extra = aTextStyle.mExtraSpacePerSpace;
if (--aTextStyle.mNumSpaces == 0) {
@@ -1242,18 +1234,12 @@ TextFrame::GetWidth(nsIRenderingContext& aRenderingContext,
}
else {
if (lastFont != aTextStyle.mNormalFont) {
aRenderingContext.SetFont(aTextStyle.mNormalFont);
aRenderingContext.GetWidth(ch, charWidth);
aRenderingContext.SetFont(aTextStyle.mSmallFont);
lastFont = aTextStyle.mNormalFont;
aRenderingContext.SetFont(lastFont);
}
else {
aRenderingContext.GetWidth(ch, charWidth);
}
nextFont = aTextStyle.mNormalFont;
aRenderingContext.GetWidth(ch, charWidth);
glyphWidth = charWidth + aTextStyle.mLetterSpacing;
}
if (nextFont != lastFont)
lastFont = nextFont;
sum += glyphWidth;
*bp++ = ch;
}
@@ -2241,7 +2227,8 @@ TextFrame::Reflow(nsIPresContext& aPresContext,
PRInt32 column = lineLayout.GetColumn();
PRInt32 prevColumn = column;
mColumn = column;
PRBool breakable = 0 != lineLayout.GetPlacedFrames();
PRBool breakable = !lineLayout.LineIsEmpty();
for (;;) {
// Get next word/whitespace from the text
PRBool isWhitespace;