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

Fix for 41006 -- fix for overlapping text when drawing text runs. r=ftang

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@71293 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sfraser%netscape.com
2000-06-01 22:54:49 +00:00
parent da5f71f1f3
commit f92cf61e0b
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/gfx/src/mac/nsUnicodeRenderingToolkit.cpp
View File

@@ -754,9 +754,12 @@ void nsUnicodeRenderingToolkit :: DrawScriptText(
PRInt32 y,
short& oWidth)
{
oWidth = ::TextWidth(buf, 0, aLen);
::MoveTo(x, y);
::MoveTo(x, y);
::DrawText(buf,0,aLen);
Point penLoc;
::GetPen(&penLoc);
oWidth = penLoc.h - x;
}
//------------------------------------------------------------------------
@@ -1143,17 +1146,16 @@ NS_IMETHODIMP nsUnicodeRenderingToolkit :: DrawString(const PRUnichar *aString,
{
nextFont = fontmap->GetFontID(uch);
if (thisFont != nextFont)
{ // start new font run...
{
// start new font run...
PRInt32 transformedX = currentX, ignoreY = 0;
mGS->mTMatrix.TransformCoord(&transformedX, &ignoreY);
mGS->mTMatrix.TransformCoord(&transformedX, &ignoreY);
res = DrawTextSegment(aString + start, i - start, thisFont, scriptFallbackFonts, transformedX, transformedY, thisWidth);
if (NS_FAILED(res))
return res;
currentX += thisWidth;
currentX += NSToCoordRound(float(thisWidth) * mP2T);
start = i;
thisFont = nextFont;
}