From 95c3c493bdace818d9a7b52db8694b197d141fc4 Mon Sep 17 00:00:00 2001 From: Nicolas Jarnoux Date: Thu, 5 Dec 2019 11:20:27 +0000 Subject: [PATCH] Don't impose event handling --- src/osgQOpenGL/osgQOpenGLWidget.cpp | 85 +---------------------------- 1 file changed, 2 insertions(+), 83 deletions(-) diff --git a/src/osgQOpenGL/osgQOpenGLWidget.cpp b/src/osgQOpenGL/osgQOpenGLWidget.cpp index fe16e87..7e14291 100644 --- a/src/osgQOpenGL/osgQOpenGLWidget.cpp +++ b/src/osgQOpenGL/osgQOpenGLWidget.cpp @@ -71,89 +71,8 @@ void osgQOpenGLWidget::keyPressEvent(QKeyEvent* event) { Q_ASSERT(m_renderer); - if(event->key() == Qt::Key_F) - { - static QSize g; - static QMargins sMargins; - - if(parent() && parent()->isWidgetType()) - { - QMainWindow* _mainwindow = dynamic_cast(parent()); - - if(_mainwindow) - { - g = size(); - - if(layout()) - sMargins = layout()->contentsMargins(); - - bool ok = true; - - // select screen - if(qApp->screens().size() > 1) - { - QMap screens; - int screenNumber = 0; - - for(QScreen* screen : qApp->screens()) - { - QString name = screen->name(); - - if(name.isEmpty()) - { - name = tr("Screen %1").arg(screenNumber); - } - - name += " (" + QString::number(screen->size().width()) + "x" + QString::number( - screen->size().height()) + ")"; - screens[name] = screen; - ++screenNumber; - } - - QString selected = QInputDialog::getItem(this, - tr("Choose fullscreen target screen"), tr("Screen"), screens.keys(), 0, false, - &ok); - - if(ok && !selected.isEmpty()) - { - context()->setScreen(screens[selected]); - move(screens[selected]->geometry().x(), screens[selected]->geometry().y()); - resize(screens[selected]->geometry().width(), - screens[selected]->geometry().height()); - } - } - - if(ok) - { - // in fullscreen mode, a thiner (1px) border around - // viewer widget - if(layout()) - layout()->setContentsMargins(1, 1, 1, 1); - - setParent(0); - showFullScreen(); - } - } - } - else - { - showNormal(); - setMinimumSize(g); - QMainWindow* _mainwindow = dynamic_cast(parent()); - _mainwindow->setCentralWidget(this); - - if(layout()) - layout()->setContentsMargins(sMargins); - - qApp->processEvents(); - setMinimumSize(QSize(1, 1)); - } - } - else // not 'F' key - { - // forward event to renderer - m_renderer->keyPressEvent(event); - } + // forward event to renderer + m_renderer->keyPressEvent(event); } void osgQOpenGLWidget::keyReleaseEvent(QKeyEvent* event)