From 97d36fa1cdffc2d8a8fd2ae0136823a9ff65037d Mon Sep 17 00:00:00 2001 From: Svetlana Kulikova Date: Wed, 25 Sep 2024 14:20:31 +0300 Subject: [PATCH] Fix multiline Text Widget indentation --- PdfFile/PdfWriter.cpp | 4 ++-- PdfFile/test/test.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/PdfFile/PdfWriter.cpp b/PdfFile/PdfWriter.cpp index 8fa07f2d6c..9eee873e52 100644 --- a/PdfFile/PdfWriter.cpp +++ b/PdfFile/PdfWriter.cpp @@ -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; diff --git a/PdfFile/test/test.cpp b/PdfFile/test/test.cpp index a06c61274c..05d612927a 100644 --- a/PdfFile/test/test.cpp +++ b/PdfFile/test/test.cpp @@ -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);