diff --git a/src/gui/qgstextformatwidget.cpp b/src/gui/qgstextformatwidget.cpp index 8bbe2cc3c1e8..e85d07f7ed05 100644 --- a/src/gui/qgstextformatwidget.cpp +++ b/src/gui/qgstextformatwidget.cpp @@ -78,8 +78,8 @@ void QgsTextFormatWidget::initWidget() connect( mFontMinPixelSpinBox, static_cast < void ( QSpinBox::* )( int ) > ( &QSpinBox::valueChanged ), this, &QgsTextFormatWidget::mFontMinPixelSpinBox_valueChanged ); connect( mFontMaxPixelSpinBox, static_cast < void ( QSpinBox::* )( int ) > ( &QSpinBox::valueChanged ), this, &QgsTextFormatWidget::mFontMaxPixelSpinBox_valueChanged ); connect( mBufferUnitWidget, &QgsUnitSelectionWidget::changed, this, &QgsTextFormatWidget::mBufferUnitWidget_changed ); - connect( mCoordXDDBtn, &QgsPropertyOverrideButton::activated, this, &QgsTextFormatWidget::mCoordXDDBtn_activated ); - connect( mCoordYDDBtn, &QgsPropertyOverrideButton::activated, this, &QgsTextFormatWidget::mCoordYDDBtn_activated ); + connect( mCoordXDDBtn, &QgsPropertyOverrideButton::changed, this, &QgsTextFormatWidget::mCoordXDDBtn_changed ); + connect( mCoordYDDBtn, &QgsPropertyOverrideButton::changed, this, &QgsTextFormatWidget::mCoordYDDBtn_changed ); connect( mShapeTypeCmbBx, static_cast( &QComboBox::currentIndexChanged ), this, &QgsTextFormatWidget::mShapeTypeCmbBx_currentIndexChanged ); connect( mShapeRotationCmbBx, static_cast( &QComboBox::currentIndexChanged ), this, &QgsTextFormatWidget::mShapeRotationCmbBx_currentIndexChanged ); connect( mShapeSVGParamsBtn, &QPushButton::clicked, this, &QgsTextFormatWidget::mShapeSVGParamsBtn_clicked ); @@ -1422,9 +1422,9 @@ void QgsTextFormatWidget::mBufferUnitWidget_changed() updateFont( mRefFont ); } -void QgsTextFormatWidget::mCoordXDDBtn_activated( bool active ) +void QgsTextFormatWidget::mCoordXDDBtn_changed( ) { - if ( !active ) //no data defined alignment without data defined position + if ( !mCoordXDDBtn->isActive() ) //no data defined alignment without data defined position { enableDataDefinedAlignment( false ); } @@ -1434,9 +1434,9 @@ void QgsTextFormatWidget::mCoordXDDBtn_activated( bool active ) } } -void QgsTextFormatWidget::mCoordYDDBtn_activated( bool active ) +void QgsTextFormatWidget::mCoordYDDBtn_changed( ) { - if ( !active ) //no data defined alignment without data defined position + if ( !mCoordYDDBtn->isActive() ) //no data defined alignment without data defined position { enableDataDefinedAlignment( false ); } diff --git a/src/gui/qgstextformatwidget.h b/src/gui/qgstextformatwidget.h index 6015cc9b7666..d5c6f1e67931 100644 --- a/src/gui/qgstextformatwidget.h +++ b/src/gui/qgstextformatwidget.h @@ -275,8 +275,8 @@ class GUI_EXPORT QgsTextFormatWidget : public QWidget, public QgsExpressionConte void mFontMinPixelSpinBox_valueChanged( int px ); void mFontMaxPixelSpinBox_valueChanged( int px ); void mBufferUnitWidget_changed(); - void mCoordXDDBtn_activated( bool active ); - void mCoordYDDBtn_activated( bool active ); + void mCoordXDDBtn_changed( ); + void mCoordYDDBtn_changed( ); void mShapeTypeCmbBx_currentIndexChanged( int index ); void mShapeRotationCmbBx_currentIndexChanged( int index ); void mShapeSVGParamsBtn_clicked();