HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1376:b8327d173f37

Restored graph D&D and added full screen mode (F11)...

jeandet -

r1376:b8327d173f37

parent child

Context file:

r1376:b8327d173f37

app/include/MainWindow.h +6 -4

                 Q_OBJECT
             public:
-                explicit MainWindow(QWidget *parent = 0);
+                explicit MainWindow(QWidget *parent = nullptr);
-                virtual ~MainWindow();
+                virtual ~MainWindow() override;
             public slots:
             protected:
-                void changeEvent(QEvent *e);
+                void changeEvent(QEvent *e) override;
-                void closeEvent(QCloseEvent *event);
+                void closeEvent(QCloseEvent *event) override;
+                void keyPressEvent(QKeyEvent *event) override;
             private:
                 std::unique_ptr<Ui::MainWindow> m_Ui;

app/src/MainWindow.cpp +19 0

@@ -350,6 +350,25 void MainWindow::closeEvent(QCloseEvent *event)
350	}	350	}
351	}	351	}
352		352
		353	void MainWindow::keyPressEvent(QKeyEvent *event)
		354	{
		355	switch (event->key())
		356	{
		357	case Qt::Key_F11:
		358	if(this->isFullScreen())
		359	{
		360	this->showNormal();
		361	}
		362	else
		363	{
		364	this->showFullScreen();
		365	}
		366	break;
		367	default:
		368	break;
		369	}
		370	}
		371
353	bool MainWindow::MainWindowPrivate::checkDataToSave(QWidget *parentWidget)	372	bool MainWindow::MainWindowPrivate::checkDataToSave(QWidget *parentWidget)
354	{	373	{
355	auto hasChanges = sqpApp->catalogueController().hasChanges();	374	auto hasChanges = sqpApp->catalogueController().hasChanges();

gui/src/Visualization/VisualizationGraphWidget.cpp +5 -3

                 {
                     impl->m_RenderingDelegate->updateTooltip(event);
                 }
-                event->accept();
+                //event->accept();
+                QWidget::mouseMoveEvent(event);
             }
             void VisualizationGraphWidget::mouseReleaseEvent(QMouseEvent *event)
                         impl->enterPlotDrag(event->pos());
                     }
                 }
-                event->accept();
+                //event->accept();
+                QWidget::mousePressEvent(event);
             }
             void VisualizationGraphWidget::mouseDoubleClickEvent(QMouseEvent *event)
                         break;
                 }
                 setCursor(Qt::ArrowCursor);
-                event->accept();
+                //event->accept();
             }
             void VisualizationGraphWidget::keyPressEvent(QKeyEvent *event)

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages