Replace ESC shortcut for exiting full screen with solution from ros-visualization/rviz#1416 (#1205) (#1211)

(cherry picked from commit 526f251)

Co-authored-by: Michael Ripperger <[email protected]>

Author: mergify[bot]

rviz_common/include/rviz_common/visualization_manager.hpp

@@ -316,6 +316,9 @@ public Q_SLOTS:
   /// Emitted during file-loading and initialization to indicate progress.
   void statusUpdate(const QString & message);
 
+  /// Emmited when ESC key is pressed
+  void escapePressed();
+
 protected Q_SLOTS:
   /// Call update() on all managed objects.
   /**

rviz_common/src/rviz_common/visualization_frame.cpp

@@ -343,6 +343,7 @@ void VisualizationFrame::initialize(
   ToolManager * tool_man = manager_->getToolManager();
 
   connect(manager_, SIGNAL(configChanged()), this, SLOT(setDisplayConfigModified()));
+  connect(manager_, SIGNAL(escapePressed()), this, SLOT(exitFullScreen()));
   connect(tool_man, SIGNAL(toolAdded(Tool*)), this, SLOT(addTool(Tool*)));
   connect(tool_man, SIGNAL(toolRemoved(Tool*)), this, SLOT(removeTool(Tool*)));
   connect(tool_man, SIGNAL(toolRefreshed(Tool*)), this, SLOT(refreshTool(Tool*)));
@@ -498,7 +499,6 @@ void VisualizationFrame::initMenus()
   this->addAction(fullscreen_action);  // Also add to window, or the shortcut doest work
                                        // when the menu is hidden.
   connect(this, SIGNAL(fullScreenChange(bool)), fullscreen_action, SLOT(setChecked(bool)));
-  new QShortcut(Qt::Key_Escape, this, SLOT(exitFullScreen()));
   view_menu_->addSeparator();
 
   QMenu * help_menu = menuBar()->addMenu("&Help");

rviz_common/src/rviz_common/visualization_manager.cpp

@@ -51,6 +51,7 @@
 
 #include <QApplication>  // NOLINT: cpplint cannot handle include order here
 #include <QCursor>  // NOLINT: cpplint cannot handle include order here
+#include <QKeyEvent>  // NOLINT: cpplint cannot handle include order here
 #include <QTimer>  // NOLINT: cpplint cannot handle include order here
 #include <QWindow>  // NOLINT: cpplint cannot handle include order here
 
@@ -692,6 +693,9 @@ void VisualizationManager::handleMouseEvent(const ViewportMouseEvent & vme)
 
 void VisualizationManager::handleChar(QKeyEvent * event, RenderPanel * panel)
 {
+  if (event->key() == Qt::Key_Escape) {
+    Q_EMIT escapePressed();
+  }
   tool_manager_->handleChar(event, panel);
 }