pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

сдвиг букв завязан на матрицу шрифта

Browse Source 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@65352 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
Oleg.Korshul
2015-10-19 13:36:14 +00:00
committed by Alexander Trofimov
parent 4133260283
commit e871416160
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
DesktopEditor/fontengine/FontFile.cpp
View File

@ -986,7 +986,9 @@ INT CFontFile::GetString(CGlyphString& oString)
oString.SetBBox(nIndex, 0, 0, 0, 0);
oString.SetState (nIndex, glyphstateMiss);
fPenX += (float)(oSizes.fAdvanceX + m_dCharSpacing);
double dAdvanceW = m_arrdFontMatrix[0] * oSizes.fAdvanceX;
fPenX += (float)(dAdvanceW + m_dCharSpacing);
unPrevGID = 0;
continue;
@ -1025,7 +1027,9 @@ INT CFontFile::GetString(CGlyphString& oString)
oString.GetAt(nIndex)->oMetrics = oSizes.oMetrics;
oString.SetBBox(nIndex, oSizes.oBBox.fMinX, oSizes.oBBox.fMaxY, oSizes.oBBox.fMaxX, oSizes.oBBox.fMinY);
fPenX += (float)(oSizes.fAdvanceX + m_dCharSpacing);
double dAdvanceW = m_arrdFontMatrix[0] * oSizes.fAdvanceX;
fPenX += (float)(dAdvanceW + m_dCharSpacing);
if (m_bNeedDoBold)
{
@ -1272,7 +1276,9 @@ INT CFontFile::GetString2(CGlyphString& oString)
oString.SetBBox(nIndex, 0, 0, 0, 0);
oString.SetState (nIndex, glyphstateMiss);
fPenX += (float)(oSizes.fAdvanceX + m_dCharSpacing);
double dAdvanceW = m_arrdFontMatrix[0] * oSizes.fAdvanceX;
fPenX += (float)(dAdvanceW + m_dCharSpacing);
unPrevGID = 0;
continue;
@ -1311,8 +1317,10 @@ INT CFontFile::GetString2(CGlyphString& oString)
oString.GetAt(nIndex)->oMetrics = oSizes.oMetrics;
oString.SetBBox(nIndex, oSizes.oBBox.fMinX, oSizes.oBBox.fMaxY, oSizes.oBBox.fMaxX, oSizes.oBBox.fMinY);
fPenX += (float)(oSizes.fAdvanceX + m_dCharSpacing);
double dAdvanceW = m_arrdFontMatrix[0] * oSizes.fAdvanceX;
fPenX += (float)(dAdvanceW + m_dCharSpacing);
if (m_bNeedDoBold)
{
// Когда текст делаем жирным сами, то мы увеличиваем расстояние на 1 пиксель в ширину (независимо от DPI и размера текста всегда 1 пиксель)
@ -1570,7 +1578,8 @@ INT CFontFile::GetString2C(CGlyphString& oString)
pCurGlyph->fY = (float)(oString.m_arrCTM[5] + fX * oString.m_arrCTM[1] + fY * oString.m_arrCTM[3] - oString.m_fY);
}
fPenX += (float)(m_oCacheSizes[charSymbolObj].fAdvanceX + m_dCharSpacing);
double dAdvanceW = m_arrdFontMatrix[0] * m_oCacheSizes[charSymbolObj].fAdvanceX;
fPenX += (float)(dAdvanceW + m_dCharSpacing);
if (m_bNeedDoBold)
{
// Когда текст делаем жирным сами, то мы увеличиваем расстояние на 1 пиксель в ширину (независимо от DPI и размера текста всегда 1 пиксель)