[labeling][ui] Fix broken multiline alignment combo box

nirvn · nirvn · commit 575b0de82d63 · 2019-05-28T16:16:17.000+07:00
- setup geometry generator ui stuff first to properly initiate combobox
- for line and polygons, don't set combobox to a missing item, default to left alignment
diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
@@ -133,10 +133,14 @@ void QgsLabelingGui::setLayer( QgsMapLayer *mapLayer )
   mFieldExpressionWidget->setEnabled( mMode == Labels );
   mLabelingFrame->setEnabled( mMode == Labels );
 
-  updateWidgetForFormat( lyr.format() );
-
   blockInitSignals( true );
 
+  mGeometryGenerator->setText( lyr.geometryGenerator );
+  mGeometryGeneratorGroupBox->setChecked( lyr.geometryGeneratorEnabled );
+  mGeometryGeneratorType->setCurrentIndex( mGeometryGeneratorType->findData( lyr.geometryGeneratorType ) );
+
+  updateWidgetForFormat( lyr.format() );
+
   mFieldExpressionWidget->setRow( -1 );
   mFieldExpressionWidget->setField( lyr.fieldName );
   mCheckBoxSubstituteText->setChecked( lyr.useSubstitutions );
@@ -229,7 +233,18 @@ void QgsLabelingGui::setLayer( QgsMapLayer *mapLayer )
   wrapCharacterEdit->setText( lyr.wrapChar );
   mAutoWrapLengthSpinBox->setValue( lyr.autoWrapLength );
   mAutoWrapTypeComboBox->setCurrentIndex( lyr.useMaxLineLengthForAutoWrap ? 0 : 1 );
-  mFontMultiLineAlignComboBox->setCurrentIndex( lyr.multilineAlign );
+
+  if ( ( int ) lyr.multilineAlign < mFontMultiLineAlignComboBox->count() )
+  {
+    mFontMultiLineAlignComboBox->setCurrentIndex( lyr.multilineAlign );
+  }
+  else
+  {
+    // the default pal layer settings for multiline alignment is to follow label placement, which isn't always available
+    // revert to left alignment in such case
+    mFontMultiLineAlignComboBox->setCurrentIndex( 0 );
+  }
+
   chkPreserveRotation->setChecked( lyr.preserveRotation );
 
   mPreviewBackgroundBtn->setColor( lyr.previewBkgrdColor );
@@ -253,10 +268,6 @@ void QgsLabelingGui::setLayer( QgsMapLayer *mapLayer )
 
   mZIndexSpinBox->setValue( lyr.zIndex );
 
-  mGeometryGenerator->setText( lyr.geometryGenerator );
-  mGeometryGeneratorGroupBox->setChecked( lyr.geometryGeneratorEnabled );
-  mGeometryGeneratorType->setCurrentIndex( mGeometryGeneratorType->findData( lyr.geometryGeneratorType ) );
-
   mDataDefinedProperties = lyr.dataDefinedProperties();
 
   updatePlacementWidgets();
