Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[backport] Fix labeling aligment DD activation signals #37167

Merged
merged 1 commit into from
Jun 12, 2020
Merged

[backport] Fix labeling aligment DD activation signals #37167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/gui/qgstextformatwidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down Expand Up @@ -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 );
}
Expand All @@ -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 );
}
Expand Down
4 changes: 2 additions & 2 deletions src/gui/qgstextformatwidget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down