Ensure canvas has focus if nothing else has

Forward port from Sourcepole's fork
qgis · Aug 21, 2017 · a6b0c44 · a6b0c44 · wonder-sk · Dec 29, 2017
1 parent 4c52607
commit a6b0c44
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1234,6 +1234,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
   }
 #endif
 
+  connect( qApp, SIGNAL( focusChanged( QWidget*, QWidget* ) ), this, SLOT( onFocusChanged( QWidget*, QWidget* ) ) );
 } // QgisApp ctor
 
 QgisApp::QgisApp()
@@ -8791,6 +8792,15 @@ void QgisApp::userRotation()
   mMapCanvas->refresh();
 }
 
+void QgisApp::onFocusChanged( QWidget* /*old*/, QWidget* now )
+{
+  // If nothing has focus even though the window is active, ensure map canvas receives it
+  if ( !now && isActiveWindow() )
+  {
+    mapCanvas()->setFocus();
+  }
+}
+
 // toggle overview status
 void QgisApp::isInOverview()
 {

diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -1510,6 +1510,8 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
 
     void updateCrsStatusBar();
 
+    void onFocusChanged( QWidget* old, QWidget* now );
+
   signals:
 
     /**