fenix/PDF4QT
1
0
Fork 0
mirror of https://github.com/JakubMelka/PDF4QT.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Issue #118: Refactoring of forms finished

Browse Source
This commit is contained in:
Jakub Melka
2023-12-07 17:53:50 +01:00
parent b4d123baac
commit 0e1959b3aa
6 changed files with 203 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Pdf4QtLibCore/sources/pdfannotation.cpp
View File

@ -1424,11 +1424,9 @@ bool PDFAnnotationManager::isAnnotationDrawnByEditor(const PageAnnotation& annot
return false;
}
const PDFFormFieldWidgetEditor* editor = nullptr;
if (annotation.annotation->getType() == AnnotationType::Widget)
{
editor = m_formManager->getEditor(m_formManager->getFormFieldForWidget(annotation.annotation->getSelfReference()));
return editor && editor->isEditorDrawEnabled();
return m_formManager->isEditorDrawEnabled(annotation.annotation->getSelfReference());
}
return false;
@ -3105,10 +3103,9 @@ void PDFWidgetAnnotation::draw(AnnotationDrawParameters& parameters) const
PDFPainterStateGuard guard(parameters.painter);
parameters.painter->setCompositionMode(getCompositionMode());
const PDFFormFieldWidgetEditor* editor = parameters.formManager->getEditor(formField);
if (editor && editor->isEditorDrawEnabled())
if (parameters.formManager->isEditorDrawEnabled(formField))
{
editor->draw(parameters, true);
parameters.formManager->drawFormField(formField, parameters, true);
}
else
{
@ -3117,7 +3114,7 @@ void PDFWidgetAnnotation::draw(AnnotationDrawParameters& parameters) const
case PDFFormField::FieldType::Text:
case PDFFormField::FieldType::Choice:
{
editor->draw(parameters, false);
m_parameters.formManager->drawFormField(parameters, false);
break;
}
@ -3146,8 +3143,6 @@ void PDFWidgetAnnotation::draw(AnnotationDrawParameters& parameters) const
font.setPixelSize(qCeil(fontSize));
font.setStyleStrategy(QFont::ForceOutline);
QFontMetrics fontMetrics(font);
QPainter* painter = parameters.painter;
painter->translate(rectangle.bottomLeft());
painter->scale(1.0, -1.0);