Fix escape and enter don't work to close color or symbol selector dia…

…logs Fixes #27602 (cherry picked from commit 2e25151)
qgis · Dec 16, 2019 · be563c1 · be563c1
1 parent e76654b
commit be563c1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/src/gui/qgscolordialog.cpp b/src/gui/qgscolordialog.cpp
@@ -42,6 +42,8 @@ QgsColorDialog::QgsColorDialog( QWidget *parent, Qt::WindowFlags fl, const QColo
   connect( mButtonBox, &QDialogButtonBox::rejected, this, &QgsColorDialog::mButtonBox_rejected );
   connect( mButtonBox, &QDialogButtonBox::clicked, this, &QgsColorDialog::mButtonBox_clicked );
 
+  connect( mColorWidget, &QgsPanelWidget::panelAccepted, this, &QDialog::reject );
+
   if ( mPreviousColor.isValid() )
   {
     QPushButton *resetButton = new QPushButton( tr( "Reset" ) );

diff --git a/src/gui/qgspanelwidget.cpp b/src/gui/qgspanelwidget.cpp
@@ -105,6 +105,10 @@ void QgsPanelWidget::keyPressEvent( QKeyEvent *event )
   {
     acceptPanel();
   }
+  else
+  {
+    QWidget::keyPressEvent( event );
+  }
 }
 
 QgsPanelWidgetWrapper::QgsPanelWidgetWrapper( QWidget *widget, QWidget *parent )

diff --git a/src/gui/symbology/qgssymbolselectordialog.cpp b/src/gui/symbology/qgssymbolselectordialog.cpp
@@ -776,6 +776,8 @@ QgsSymbolSelectorDialog::QgsSymbolSelectorDialog( QgsSymbol *symbol, QgsStyle *s
   layout()->addWidget( mSelectorWidget );
   layout()->addWidget( mButtonBox );
 
+  connect( mSelectorWidget, &QgsPanelWidget::panelAccepted, this, &QDialog::reject );
+
   mSelectorWidget->setMinimumSize( 460, 560 );
   setObjectName( QStringLiteral( "SymbolSelectorDialog" ) );
   QgsGui::instance()->enableAutoGeometryRestore( this );