Update kreslení anotací

This commit is contained in:
Jakub Melka
2025-02-23 19:49:04 +01:00
parent 046b68fa64
commit 63d81e751d
2 changed files with 2 additions and 15 deletions

View File

@ -1454,7 +1454,6 @@ void PDFAnnotationManager::drawPage(QPainter* painter,
const PDFCMSPointer cms = m_cmsManager->getCurrentCMS(); const PDFCMSPointer cms = m_cmsManager->getCurrentCMS();
m_fontCache->setCacheShrinkEnabled(&fontCacheLock, false); m_fontCache->setCacheShrinkEnabled(&fontCacheLock, false);
const PageAnnotation* annotationDrawnByEditor = nullptr;
for (const PageAnnotation& annotation : annotations.annotations) for (const PageAnnotation& annotation : annotations.annotations)
{ {
// If annotation draw is not enabled, then skip it // If annotation draw is not enabled, then skip it
@ -1463,19 +1462,7 @@ void PDFAnnotationManager::drawPage(QPainter* painter,
continue; continue;
} }
if (isAnnotationDrawnByEditor(annotation)) drawAnnotation(annotation, pagePointToDevicePointMatrix, page, cms.data(), isAnnotationDrawnByEditor(annotation), errors, painter);
{
Q_ASSERT(!annotationDrawnByEditor);
annotationDrawnByEditor = &annotation;
continue;
}
drawAnnotation(annotation, pagePointToDevicePointMatrix, page, cms.data(), false, errors, painter);
}
if (annotationDrawnByEditor)
{
drawAnnotation(*annotationDrawnByEditor, pagePointToDevicePointMatrix, page, cms.data(), true, errors, painter);
} }
m_fontCache->setCacheShrinkEnabled(&fontCacheLock, true); m_fontCache->setCacheShrinkEnabled(&fontCacheLock, true);

View File

@ -382,7 +382,7 @@ signals:
void pageLayoutChanged(); void pageLayoutChanged();
void renderingError(pdf::PDFInteger pageIndex, const QList<pdf::PDFRenderError>& errors); void renderingError(pdf::PDFInteger pageIndex, const QList<pdf::PDFRenderError>& errors);
void repaintNeeded(); void repaintNeeded();
void pageImageChanged(bool all, const std::vector<PDFInteger>& pages); void pageImageChanged(bool all, const std::vector<pdf::PDFInteger>& pages);
void textLayoutChanged(); void textLayoutChanged();
private: private: