[labeling] allows data defined to align multiline when wordwrap function is used as expression (fix #11805)

This commit is contained in:
Salvatore Larosa 2014-12-08 22:39:29 +01:00
parent e568493653
commit 368fc674bb

View File

@ -3554,7 +3554,7 @@ void QgsPalLabeling::dataDefinedTextFormatting( QgsPalLayerSettings& tmpLyr,
tmpLyr.wrapChar = ddValues.value( QgsPalLayerSettings::MultiLineWrapChar ).toString();
}
if ( !tmpLyr.wrapChar.isEmpty() )
if ( !tmpLyr.wrapChar.isEmpty() || tmpLyr.getLabelExpression()->expression().contains( "wordwrap" ) )
{
if ( ddValues.contains( QgsPalLayerSettings::MultiLineHeight ) )