mirror of
https://github.com/mapmapteam/mapmap.git
synced 2026-06-16 12:33:19 +02:00
Bug fix: upon quitting the output window prevented the app to actually quit.
This commit is contained in:
+1
-1
@@ -1182,7 +1182,7 @@ void MainWindow::createLayout()
|
||||
destinationCanvas->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
|
||||
destinationCanvas->setMinimumSize(CANVAS_MINIMUM_WIDTH, CANVAS_MINIMUM_HEIGHT);
|
||||
|
||||
outputWindow = new OutputGLWindow(destinationCanvas);
|
||||
outputWindow = new OutputGLWindow(this, destinationCanvas);
|
||||
outputWindow->setVisible(true);
|
||||
outputWindow->installEventFilter(destinationCanvas);
|
||||
outputWindow->installEventFilter(this);
|
||||
|
||||
+1
-1
@@ -23,7 +23,7 @@
|
||||
|
||||
#include "MainWindow.h"
|
||||
|
||||
OutputGLWindow:: OutputGLWindow(const DestinationGLCanvas* canvas_)
|
||||
OutputGLWindow:: OutputGLWindow(QWidget* parent, const DestinationGLCanvas* canvas_) : QDialog(parent)
|
||||
{
|
||||
resize(MainWindow::OUTPUT_WINDOW_MINIMUM_WIDTH, MainWindow::OUTPUT_WINDOW_MINIMUM_HEIGHT);
|
||||
|
||||
|
||||
+1
-1
@@ -34,7 +34,7 @@ class OutputGLWindow : public QDialog
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
OutputGLWindow(const DestinationGLCanvas* canvas_);
|
||||
OutputGLWindow(QWidget* parent, const DestinationGLCanvas* canvas_);
|
||||
//OutputGLWindow(MainWindow* mainWindow, QWidget* parent = 0, const QGLWidget * shareWidget = 0);
|
||||
|
||||
public slots:
|
||||
|
||||
Reference in New Issue
Block a user