eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-06-16 12:33:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Base working integration of destination and output window (with crosshair working in fullscreen).

Browse Source
This commit is contained in:
Tats
2015-02-15 17:46:54 -05:00
parent 067a84cf12
commit e22075d6ad
7 changed files with 74 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OutputGLWindow.cpp
+23 -3
View File
@@ -21,11 +21,11 @@
#include "MainWindow.h"
OutputGLWindow::OutputGLWindow(MainWindow* mainWindow, QWidget* parent, const QGLWidget * shareWidget) : QDialog(parent)
OutputGLWindow:: OutputGLWindow(const DestinationGLCanvas* canvas_)
{
resize(MainWindow::OUTPUT_WINDOW_MINIMUM_WIDTH, MainWindow::OUTPUT_WINDOW_MINIMUM_HEIGHT);
canvas = new DestinationGLCanvas(mainWindow, this, shareWidget);
canvas = new DestinationGLCanvas(canvas_->getMainWindow(), this, (const QGLWidget*)canvas_->viewport(), canvas_->scene());
canvas->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
canvas->setMinimumSize(MainWindow::OUTPUT_WINDOW_MINIMUM_WIDTH, MainWindow::OUTPUT_WINDOW_MINIMUM_HEIGHT);
@@ -38,9 +38,28 @@ OutputGLWindow::OutputGLWindow(MainWindow* mainWindow, QWidget* parent, const QG
_geometry = saveGeometry();
_pointerIsVisible = true;
}
//OutputGLWindow::OutputGLWindow(MainWindow* mainWindow, QWidget* parent, const QGLWidget * shareWidget) : QDialog(parent)
//{
// resize(MainWindow::OUTPUT_WINDOW_MINIMUM_WIDTH, MainWindow::OUTPUT_WINDOW_MINIMUM_HEIGHT);
//
// canvas = new DestinationGLCanvas(mainWindow, this, shareWidget);
// canvas->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
// canvas->setMinimumSize(MainWindow::OUTPUT_WINDOW_MINIMUM_WIDTH, MainWindow::OUTPUT_WINDOW_MINIMUM_HEIGHT);
//
// QLayout* layout = new QVBoxLayout;
// layout->setContentsMargins(0,0,0,0); // remove margin
// layout->addWidget(canvas);
// setLayout(layout);
//
// // Save window geometry.
// _geometry = saveGeometry();
//
// _pointerIsVisible = true;
//
//}
void OutputGLWindow::setCursorVisible(bool visible)
{
_pointerIsVisible = visible;
@@ -52,6 +71,7 @@ void OutputGLWindow::setCursorVisible(bool visible)
}
else
{
this->setCursor(Qt::ArrowCursor);
this->setCursor(Qt::BlankCursor);
_pointerIsVisible = false;
}