Merge pull request #3309 from nirvn/html_label_fix

nyalldawson · web-flow · commit 9f330fc9ff04 · 2016-07-19T09:20:36.000+10:00
[composer] fix html label stylesheet's margin (fixes #15290)
diff --git a/src/core/composer/qgscomposerlabel.cpp b/src/core/composer/qgscomposerlabel.cpp
@@ -645,7 +645,7 @@ void QgsComposerLabel::itemShiftAdjustSize( double newWidth, double newHeight, d
 QUrl QgsComposerLabel::createStylesheetUrl() const
 {
   QString stylesheet;
-  stylesheet += QString( "body { margin: %1 %2;" ).arg( qMax( mMarginX * mHtmlUnitsToMM, 0.0 ) ).arg( qMax( mMarginY * mHtmlUnitsToMM, 0.0 ) );
+  stylesheet += QString( "body { margin: %1 %2;" ).arg( qMax( mMarginY * mHtmlUnitsToMM, 0.0 ) ).arg( qMax( mMarginX * mHtmlUnitsToMM, 0.0 ) );
   stylesheet += QgsFontUtils::asCSS( mFont, 0.352778 * mHtmlUnitsToMM );
   stylesheet += QString( "color: %1;" ).arg( mFontColor.name() );
   stylesheet += QString( "text-align: %1; }" ).arg( mHAlignment == Qt::AlignLeft ? "left" : mHAlignment == Qt::AlignRight ? "right" : "center" );

Original file line number	Diff line number	Diff line change
`@@ -645,7 +645,7 @@ void QgsComposerLabel::itemShiftAdjustSize( double newWidth, double newHeight, d`
`645`	`645`	`QUrl QgsComposerLabel::createStylesheetUrl() const`
`646`	`646`	`{`
`647`	`647`	`QString stylesheet;`
`648`		`- stylesheet += QString( "body { margin: %1 %2;" ).arg( qMax( mMarginX * mHtmlUnitsToMM, 0.0 ) ).arg( qMax( mMarginY * mHtmlUnitsToMM, 0.0 ) );`
	`648`	`+ stylesheet += QString( "body { margin: %1 %2;" ).arg( qMax( mMarginY * mHtmlUnitsToMM, 0.0 ) ).arg( qMax( mMarginX * mHtmlUnitsToMM, 0.0 ) );`
`649`	`649`	`stylesheet += QgsFontUtils::asCSS( mFont, 0.352778 * mHtmlUnitsToMM );`
`650`	`650`	`stylesheet += QString( "color: %1;" ).arg( mFontColor.name() );`
`651`	`651`	`stylesheet += QString( "text-align: %1; }" ).arg( mHAlignment == Qt::AlignLeft ? "left" : mHAlignment == Qt::AlignRight ? "right" : "center" );`