Skip to content
Permalink
Browse files

Fix labeling aligment DD activation signals

Fixes #37003

Cherry-picked from master 0e6a197
  • Loading branch information
elpaso committed Jun 12, 2020
1 parent 88cee00 commit 3a466926d41abe29cf080e809046b68780686707
Showing with 8 additions and 8 deletions.
  1. +6 −6 src/gui/qgstextformatwidget.cpp
  2. +2 −2 src/gui/qgstextformatwidget.h
@@ -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<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, &QgsTextFormatWidget::mShapeTypeCmbBx_currentIndexChanged );
connect( mShapeRotationCmbBx, static_cast<void ( QComboBox::* )( int )>( &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 );
}
@@ -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();

0 comments on commit 3a46692

Please sign in to comment.
You can’t perform that action at this time.