Fix Escape key press should close current stacked panel

Code was present but not correctly hooked up before (cherry-picked from 846ca49)
qgis · Apr 6, 2018 · b5644dd · b5644dd
1 parent f1249ce
commit b5644dd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/python/gui/qgspanelwidgetstack.sip.in b/python/gui/qgspanelwidgetstack.sip.in
@@ -130,6 +130,8 @@ This slot is normally auto connected to panelAccepted when a panel is shown.
 
     virtual void mouseReleaseEvent( QMouseEvent *e );
 
+    virtual void keyPressEvent( QKeyEvent *e );
+
 
 };
 

diff --git a/src/gui/qgspanelwidgetstack.cpp b/src/gui/qgspanelwidgetstack.cpp
@@ -155,6 +155,14 @@ void QgsPanelWidgetStack::mouseReleaseEvent( QMouseEvent *e )
   }
 }
 
+void QgsPanelWidgetStack::keyPressEvent( QKeyEvent *e )
+{
+  if ( e->key() == Qt::Key_Escape )
+  {
+    acceptCurrentPanel();
+  }
+}
+
 void QgsPanelWidgetStack::updateBreadcrumb()
 {
   QString breadcrumb;

diff --git a/src/gui/qgspanelwidgetstack.h b/src/gui/qgspanelwidgetstack.h
@@ -122,6 +122,7 @@ class GUI_EXPORT QgsPanelWidgetStack : public QWidget, private Ui::QgsRendererWi
   protected:
 
     void mouseReleaseEvent( QMouseEvent *e ) override;
+    void keyPressEvent( QKeyEvent *e ) override;
 
   private:
     void updateBreadcrumb();