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

Fixed a color bug in OFD

Browse Source
This commit is contained in:
Green
2025-08-04 17:54:26 +03:00
parent c2a733f465
commit a82cf375b7
30 changed files with 286 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OFDFile/src/Annotation.cpp
View File

@ -1,6 +1,8 @@
#include "Annotation.h"
#include "Utils/Utils.h"
#include "../../../Common/File.h"
namespace OFD
{
CParameter::CParameter(CXmlReader& oLiteReader)
@ -106,13 +108,13 @@ CAnnot::~CAnnot()
ClearContainer(m_arAppearances);
}
void CAnnot::Draw(IRenderer* pRenderer, const CCommonData& oCommonData) const
void CAnnot::Draw(IRenderer* pRenderer, const CCommonData& oCommonData, EPageType ePageType) const
{
if (!m_bPrint)
return;
for (const CAppearance* pAppearance : m_arAppearances)
pAppearance->Draw(pRenderer, oCommonData);
pAppearance->Draw(pRenderer, oCommonData, ePageType);
}
CPageAnnot::CPageAnnot()
@ -144,10 +146,10 @@ CPageAnnot* CPageAnnot::Read(const std::wstring& wsFilePath, const std::wstring&
return pPageAnnot;
}
void CPageAnnot::Draw(IRenderer* pRenderer, const CCommonData& oCommonData) const
void CPageAnnot::Draw(IRenderer* pRenderer, const CCommonData& oCommonData, EPageType ePageType) const
{
for (const CAnnot* pAnnot : m_arAnnots)
pAnnot->Draw(pRenderer, oCommonData);
pAnnot->Draw(pRenderer, oCommonData, ePageType);
}
CAnnotation::CAnnotation()
@ -195,9 +197,9 @@ bool CAnnotation::Read(const std::wstring& wsFilePath, const std::wstring& wsRoo
return nullptr != m_pPageAnnot;
}
void CAnnotation::Draw(IRenderer* pRenderer, const CCommonData& oCommonData) const
void CAnnotation::Draw(IRenderer* pRenderer, const CCommonData& oCommonData, EPageType ePageType) const
{
if (nullptr != m_pPageAnnot)
m_pPageAnnot->Draw(pRenderer, oCommonData);
m_pPageAnnot->Draw(pRenderer, oCommonData, ePageType);
}
}