Skip to content

Commit b4a2218

Browse files
committed
[labeling] always consider data-defined property for line height
1 parent 8fbb717 commit b4a2218

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

src/core/qgspallabeling.cpp

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3086,21 +3086,16 @@ void QgsPalLabeling::dataDefinedTextFormatting( QgsPalLayerSettings &tmpLyr,
30863086
tmpLyr.autoWrapLength = ddValues.value( QgsPalLayerSettings::AutoWrapLength ).toInt();
30873087
}
30883088

3089-
if ( !tmpLyr.wrapChar.isEmpty() || tmpLyr.getLabelExpression()->expression().contains( QLatin1String( "wordwrap" ) ) || tmpLyr.autoWrapLength > 0 )
3089+
if ( ddValues.contains( QgsPalLayerSettings::MultiLineHeight ) )
30903090
{
3091+
QgsTextFormat format = tmpLyr.format();
3092+
format.setLineHeight( ddValues.value( QgsPalLayerSettings::MultiLineHeight ).toDouble() );
3093+
tmpLyr.setFormat( format );
3094+
}
30913095

3092-
if ( ddValues.contains( QgsPalLayerSettings::MultiLineHeight ) )
3093-
{
3094-
QgsTextFormat format = tmpLyr.format();
3095-
format.setLineHeight( ddValues.value( QgsPalLayerSettings::MultiLineHeight ).toDouble() );
3096-
tmpLyr.setFormat( format );
3097-
}
3098-
3099-
if ( ddValues.contains( QgsPalLayerSettings::MultiLineAlignment ) )
3100-
{
3101-
tmpLyr.multilineAlign = static_cast< QgsPalLayerSettings::MultiLineAlign >( ddValues.value( QgsPalLayerSettings::MultiLineAlignment ).toInt() );
3102-
}
3103-
3096+
if ( ddValues.contains( QgsPalLayerSettings::MultiLineAlignment ) )
3097+
{
3098+
tmpLyr.multilineAlign = static_cast< QgsPalLayerSettings::MultiLineAlign >( ddValues.value( QgsPalLayerSettings::MultiLineAlignment ).toInt() );
31043099
}
31053100

31063101
if ( ddValues.contains( QgsPalLayerSettings::DirSymbDraw ) )

0 commit comments

Comments
 (0)