Rearrange buttons in feature source input widget so the "..." buttons

stay aligned in processing dialogs
qgis · Apr 1, 2020 · 991877f · 991877f
1 parent c98cd8d
commit 991877f
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/gui/processing/qgsprocessingmaplayercombobox.cpp b/src/gui/processing/qgsprocessingmaplayercombobox.cpp
@@ -50,11 +50,6 @@ QgsProcessingMapLayerComboBox::QgsProcessingMapLayerComboBox( const QgsProcessin
   layout->addWidget( mCombo );
   layout->setAlignment( mCombo, Qt::AlignTop );
 
-  mSelectButton = new QToolButton();
-  mSelectButton->setText( QString( QChar( 0x2026 ) ) );
-  mSelectButton->setToolTip( tr( "Select input" ) );
-  layout->addWidget( mSelectButton );
-  layout->setAlignment( mSelectButton, Qt::AlignTop );
   int iconSize = QgsGuiUtils::scaleIconSize( 24 );
   if ( mParameter->type() == QgsProcessingParameterFeatureSource::typeName() && type == QgsProcessingGui::Standard )
   {
@@ -86,15 +81,22 @@ QgsProcessingMapLayerComboBox::QgsProcessingMapLayerComboBox( const QgsProcessin
     connect( mSettingsButton, &QToolButton::clicked, this, &QgsProcessingMapLayerComboBox::showSourceOptions );
     layout->addWidget( mSettingsButton );
     layout->setAlignment( mSettingsButton, Qt::AlignTop );
+  }
 
+  mSelectButton = new QToolButton();
+  mSelectButton->setText( QString( QChar( 0x2026 ) ) );
+  mSelectButton->setToolTip( tr( "Select input" ) );
+  layout->addWidget( mSelectButton );
+  layout->setAlignment( mSelectButton, Qt::AlignTop );
+  if ( mParameter->type() == QgsProcessingParameterFeatureSource::typeName() )
+  {
     mFeatureSourceMenu = new QMenu( this );
     QAction *selectFromFileAction = new QAction( tr( "Select File…" ), mFeatureSourceMenu );
     connect( selectFromFileAction, &QAction::triggered, this, &QgsProcessingMapLayerComboBox::selectFromFile );
     mFeatureSourceMenu->addAction( selectFromFileAction );
     QAction *browseForLayerAction = new QAction( tr( "Browse for Layer…" ), mFeatureSourceMenu );
     connect( browseForLayerAction, &QAction::triggered, this, &QgsProcessingMapLayerComboBox::browseForLayer );
     mFeatureSourceMenu->addAction( browseForLayerAction );
-
     mSelectButton->setMenu( mFeatureSourceMenu );
     mSelectButton->setPopupMode( QToolButton::InstantPopup );
   }