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

Fix multiline Text Widget indentation

Browse Source
This commit is contained in:
Svetlana Kulikova
2024-09-25 14:20:31 +03:00
committed by Oleg Korshul
parent 87fa0f93be
commit 97d36fa1cd
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PdfFile/PdfWriter.cpp
View File

@ -3643,7 +3643,7 @@ void CPdfWriter::DrawTextWidget(NSFonts::IApplicationFonts* pAppFonts, PdfWriter
double dKoef = dFontSize / pFontTT->m_dUnitsPerEm;
double dLineHeight = (pFontTT->m_dAscent + std::abs(pFontTT->m_dDescent)) * dKoef;
m_oLinesManager.CalculateLines(dFontSize, dWidth);
m_oLinesManager.CalculateLines(dFontSize, dWidth - dShiftBorder * 4);
pTextWidget->StartAP();
@ -3852,7 +3852,7 @@ void CPdfWriter::DrawChoiceWidget(NSFonts::IApplicationFonts* pAppFonts, PdfWrit
m_oLinesManager.Init(pCodes2, pWidths, unLen, ushSpaceCode, ushNewLineCode, pFontTT->GetLineHeight(), pFontTT->GetAscent());
m_oLinesManager.CalculateLines(dFontSize, dWidth);
m_oLinesManager.CalculateLines(dFontSize, dWidth - dShiftBorder * 4);
double dKoef = dFontSize / pFontTT->m_dUnitsPerEm;
double dLineHeight = pFontTT->m_dHeight * dKoef;

8
PdfFile/test/test.cpp
View File

@ -198,7 +198,7 @@ TEST_F(CPdfFileTest, GetMetaData)
TEST_F(CPdfFileTest, PdfType)
{
//GTEST_SKIP();
GTEST_SKIP();
NSFile::CFileBinary oFile;
ASSERT_TRUE(oFile.OpenFile(wsSrcFile));
@ -234,7 +234,7 @@ TEST_F(CPdfFileTest, PdfType)
TEST_F(CPdfFileTest, GetEmbeddedFont)
{
//GTEST_SKIP();
GTEST_SKIP();
LoadFromFile();
@ -378,7 +378,7 @@ TEST_F(CPdfFileTest, EditPdf)
TEST_F(CPdfFileTest, EditPdfFromBase64)
{
GTEST_SKIP();
//GTEST_SKIP();
LoadFromFile();
ASSERT_TRUE(pdfFile->EditPdf(wsDstFile));
@ -410,7 +410,7 @@ TEST_F(CPdfFileTest, EditPdfFromBase64)
EXPECT_TRUE(NSBase64::Base64Decode((const char*)pFileContent, dwFileSize, pBuffer, &nBufferLen));
CConvertFromBinParams* pParams = new CConvertFromBinParams();
pParams->m_sMediaDirectory = NSFile::GetProcessDirectory();
pdfFile->AddToPdfFromBinary(pBuffer, nBufferLen, pParams);
pdfFile->AddToPdfFromBinary(pBuffer + 4, nBufferLen - 4, pParams);
RELEASEOBJECT(pParams);
RELEASEARRAYOBJECTS(pBuffer);