Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[3d] Fix tilting of camera in docked 3D view with Shift (fixes #17337)
This reverts a6b0c44

Map canvas was stealing keyboard focus from the docked 3D view and the key presses
of modifiers were not passed to the 3D view.
  • Loading branch information
wonder-sk committed Jan 1, 2018
1 parent 626781a commit 32504c4
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 13 deletions.
11 changes: 0 additions & 11 deletions src/app/qgisapp.cpp
Expand Up @@ -1291,7 +1291,6 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
}
#endif

connect( qApp, &QApplication::focusChanged, this, &QgisApp::onFocusChanged );
} // QgisApp ctor

QgisApp::QgisApp()
Expand Down Expand Up @@ -9127,16 +9126,6 @@ void QgisApp::userRotation()
mMapCanvas->refresh();
}

void QgisApp::onFocusChanged( QWidget *oldWidget, QWidget *newWidget )
{
Q_UNUSED( oldWidget );
// If nothing has focus even though this window is active, ensure map canvas receives it
if ( !newWidget && isActiveWindow() )
{
mapCanvas()->setFocus();
}
}

void QgisApp::projectCrsChanged()
{
updateCrsStatusBar();
Expand Down
2 changes: 0 additions & 2 deletions src/app/qgisapp.h
Expand Up @@ -1616,8 +1616,6 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow

void updateCrsStatusBar();

void onFocusChanged( QWidget *oldWidget, QWidget *newWidget );

//! handle project crs changes
void projectCrsChanged();

Expand Down

0 comments on commit 32504c4

Please sign in to comment.