From 0e6a19707e2a0c86c7d2da2c3171b6efdbf7efca Mon Sep 17 00:00:00 2001 From: Alessandro Pasotti Date: Fri, 5 Jun 2020 17:57:10 +0200 Subject: [PATCH] Fix labeling aligment DD activation signals Fixes #37003 --- src/gui/qgstextformatwidget.cpp | 12 ++++++------ src/gui/qgstextformatwidget.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gui/qgstextformatwidget.cpp b/src/gui/qgstextformatwidget.cpp index 90b6269a4bc4..f8a2e819d778 100644 --- a/src/gui/qgstextformatwidget.cpp +++ b/src/gui/qgstextformatwidget.cpp @@ -79,8 +79,8 @@ void QgsTextFormatWidget::initWidget() connect( mFontMaxPixelSpinBox, static_cast < void ( QSpinBox::* )( int ) > ( &QSpinBox::valueChanged ), this, &QgsTextFormatWidget::mFontMaxPixelSpinBox_valueChanged ); connect( mBufferUnitWidget, &QgsUnitSelectionWidget::changed, this, &QgsTextFormatWidget::mBufferUnitWidget_changed ); connect( mMaskBufferUnitWidget, &QgsUnitSelectionWidget::changed, this, &QgsTextFormatWidget::mMaskBufferUnitWidget_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 ); @@ -1496,9 +1496,9 @@ void QgsTextFormatWidget::mMaskBufferUnitWidget_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 ); } @@ -1508,9 +1508,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 c4ae28f6d63d..5f323188c25e 100644 --- a/src/gui/qgstextformatwidget.h +++ b/src/gui/qgstextformatwidget.h @@ -280,8 +280,8 @@ class GUI_EXPORT QgsTextFormatWidget : public QWidget, public QgsExpressionConte void mFontMaxPixelSpinBox_valueChanged( int px ); void mBufferUnitWidget_changed(); void mMaskBufferUnitWidget_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();