Skip to content

Commit

Permalink
Fix some data defined buttons show in text format widget
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed May 8, 2018
1 parent e936cd7 commit 00d7ab6
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/gui/qgstextformatwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1178,7 +1178,7 @@ void QgsTextFormatWidget::mShapeTypeCmbBx_currentIndexChanged( int index )
// symbology SVG renderer only supports size^2 scaling, so we only use the x size spinbox
mShapeSizeYLabel->setVisible( !isSVG );
mShapeSizeYSpnBx->setVisible( !isSVG );
mShapeSizeYDDBtn->setVisible( !isSVG );
mShapeSizeYDDBtn->setVisible( !isSVG && mWidgetMode == Labeling );
mShapeSizeXLabel->setText( tr( "Size%1" ).arg( !isSVG ? tr( " X" ) : QLatin1String( "" ) ) );

// SVG parameter setting doesn't support color's alpha component yet
Expand Down Expand Up @@ -1421,16 +1421,16 @@ void QgsTextFormatWidget::showBackgroundRadius( bool show )

mShapeRadiusUnitWidget->setVisible( show );

mShapeRadiusDDBtn->setVisible( show );
mShapeRadiusUnitsDDBtn->setVisible( show );
mShapeRadiusDDBtn->setVisible( show && mWidgetMode == Labeling );
mShapeRadiusUnitsDDBtn->setVisible( show && mWidgetMode == Labeling );
}

void QgsTextFormatWidget::showBackgroundPenStyle( bool show )
{
mShapePenStyleLabel->setVisible( show );
mShapePenStyleCmbBx->setVisible( show );

mShapePenStyleDDBtn->setVisible( show );
mShapePenStyleDDBtn->setVisible( show && mWidgetMode == Labeling );
}

void QgsTextFormatWidget::enableDataDefinedAlignment( bool enable )
Expand Down

0 comments on commit 00d7ab6

Please sign in to comment.