sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-10 00:04:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix rendering of annotation text items in HTML mode when html content

Browse Source 
is split into multiple lines
This commit is contained in:
Nyall Dawson 2024-08-05 11:22:29 +10:00
parent e8724fa45e
commit c0ff7dc49a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/annotations/qgsannotationpointtextitem.cpp
View File

@ -88,7 +88,7 @@ void QgsAnnotationPointTextItem::render( QgsRenderContext &context, QgsFeedback
QgsTextRenderer::drawText( pt, - angle * M_PI / 180.0, QgsTextRenderer::drawText( pt, - angle * M_PI / 180.0,
QgsTextRenderer::convertQtHAlignment( mAlignment ), QgsTextRenderer::convertQtHAlignment( mAlignment ),
displayText.split( '\n' ), context, mTextFormat ); mTextFormat.allowHtmlFormatting() ? QStringList{displayText }: displayText.split( '\n' ), context, mTextFormat );
} }
bool QgsAnnotationPointTextItem::writeXml( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const bool QgsAnnotationPointTextItem::writeXml( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const
@ -165,8 +165,8 @@ QgsRectangle QgsAnnotationPointTextItem::boundingBox( QgsRenderContext &context
{ {
const QString displayText = QgsExpression::replaceExpressionText( mText, &context.expressionContext(), &context.distanceArea() ); const QString displayText = QgsExpression::replaceExpressionText( mText, &context.expressionContext(), &context.distanceArea() );
const double widthInPixels = QgsTextRenderer::textWidth( context, mTextFormat, displayText.split( '\n' ) ); const double widthInPixels = QgsTextRenderer::textWidth( context, mTextFormat, mTextFormat.allowHtmlFormatting() ? QStringList{displayText }: displayText.split( '\n' ) );
const double heightInPixels = QgsTextRenderer::textHeight( context, mTextFormat, displayText.split( '\n' ) ); const double heightInPixels = QgsTextRenderer::textHeight( context, mTextFormat, mTextFormat.allowHtmlFormatting() ? QStringList{displayText }: displayText.split( '\n' ) );
// text size has already been calculated using any symbology reference scale factor above -- we need // text size has already been calculated using any symbology reference scale factor above -- we need
// to temporarily remove the reference scale here or we'll be undoing the scaling // to temporarily remove the reference scale here or we'll be undoing the scaling

2
src/core/annotations/qgsannotationrectangletextitem.cpp
View File

@ -96,7 +96,7 @@ void QgsAnnotationRectangleTextItem::render( QgsRenderContext &context, QgsFeedb
context.setFlag( Qgis::RenderContextFlag::ApplyScalingWorkaroundForTextRendering, true ); context.setFlag( Qgis::RenderContextFlag::ApplyScalingWorkaroundForTextRendering, true );
QgsTextRenderer::drawText( innerRect, 0, QgsTextRenderer::drawText( innerRect, 0,
QgsTextRenderer::convertQtHAlignment( mAlignment ), QgsTextRenderer::convertQtHAlignment( mAlignment ),
displayText.split( '\n' ), context, mTextFormat, true, mTextFormat.allowHtmlFormatting() ? QStringList{displayText }: displayText.split( '\n' ), context, mTextFormat, true,
QgsTextRenderer::convertQtVAlignment( mAlignment ), QgsTextRenderer::convertQtVAlignment( mAlignment ),
Qgis::TextRendererFlag::WrapLines ); Qgis::TextRendererFlag::WrapLines );
context.setFlag( Qgis::RenderContextFlag::ApplyScalingWorkaroundForTextRendering, prevWorkaroundFlag ); context.setFlag( Qgis::RenderContextFlag::ApplyScalingWorkaroundForTextRendering, prevWorkaroundFlag );