diff --git a/app/include/MainWindow.h b/app/include/MainWindow.h index d16d4f5..08f87a3 100644 --- a/app/include/MainWindow.h +++ b/app/include/MainWindow.h @@ -46,13 +46,15 @@ class MainWindow : public QMainWindow { Q_OBJECT public: - explicit MainWindow(QWidget *parent = 0); - virtual ~MainWindow(); + explicit MainWindow(QWidget *parent = nullptr); + virtual ~MainWindow() override; public slots: protected: - void changeEvent(QEvent *e); - void closeEvent(QCloseEvent *event); + void changeEvent(QEvent *e) override; + void closeEvent(QCloseEvent *event) override; + + void keyPressEvent(QKeyEvent *event) override; private: std::unique_ptr m_Ui; diff --git a/app/src/MainWindow.cpp b/app/src/MainWindow.cpp index 7fe304d..54f09a0 100644 --- a/app/src/MainWindow.cpp +++ b/app/src/MainWindow.cpp @@ -350,6 +350,25 @@ void MainWindow::closeEvent(QCloseEvent *event) } } +void MainWindow::keyPressEvent(QKeyEvent *event) +{ + switch (event->key()) + { + case Qt::Key_F11: + if(this->isFullScreen()) + { + this->showNormal(); + } + else + { + this->showFullScreen(); + } + break; + default: + break; + } +} + bool MainWindow::MainWindowPrivate::checkDataToSave(QWidget *parentWidget) { auto hasChanges = sqpApp->catalogueController().hasChanges(); diff --git a/gui/src/Visualization/VisualizationGraphWidget.cpp b/gui/src/Visualization/VisualizationGraphWidget.cpp index 8a86c37..5c92b11 100644 --- a/gui/src/Visualization/VisualizationGraphWidget.cpp +++ b/gui/src/Visualization/VisualizationGraphWidget.cpp @@ -863,7 +863,8 @@ void VisualizationGraphWidget::mouseMoveEvent(QMouseEvent *event) { impl->m_RenderingDelegate->updateTooltip(event); } - event->accept(); + //event->accept(); + QWidget::mouseMoveEvent(event); } void VisualizationGraphWidget::mouseReleaseEvent(QMouseEvent *event) @@ -923,7 +924,8 @@ void VisualizationGraphWidget::mousePressEvent(QMouseEvent *event) impl->enterPlotDrag(event->pos()); } } - event->accept(); + //event->accept(); + QWidget::mousePressEvent(event); } void VisualizationGraphWidget::mouseDoubleClickEvent(QMouseEvent *event) @@ -945,7 +947,7 @@ void VisualizationGraphWidget::keyReleaseEvent(QKeyEvent *event) break; } setCursor(Qt::ArrowCursor); - event->accept(); + //event->accept(); } void VisualizationGraphWidget::keyPressEvent(QKeyEvent *event)