diff --git a/MainWindow.cpp b/MainWindow.cpp index d78f62c..42af841 100644 --- a/MainWindow.cpp +++ b/MainWindow.cpp @@ -1778,7 +1778,7 @@ void MainWindow::createActions() addAction(displayControlsAction); // Manage show/hide of canvas controls. connect(displayControlsAction, SIGNAL(toggled(bool)), this, SLOT(enableDisplayControls(bool))); - connect(displayControlsAction, SIGNAL(toggled(bool)), outputWindow, SLOT(setDisplayCrosshair(bool))); + connect(displayControlsAction, SIGNAL(toggled(bool)), outputWindow, SLOT(setCanvasDisplayCrosshair(bool))); // Toggle display of canvas controls. displayPaintControlsAction = new QAction(tr("&Display Controls of Mappings of a Paint"), this); diff --git a/OutputGLWindow.cpp b/OutputGLWindow.cpp index 8ef86ae..4fd8d21 100644 --- a/OutputGLWindow.cpp +++ b/OutputGLWindow.cpp @@ -38,7 +38,7 @@ OutputGLWindow:: OutputGLWindow(QWidget* parent, const MapperGLCanvas* canvas_) layout->addWidget(canvas); setLayout(layout); - setDisplayCrosshair(false); // default + setCanvasDisplayCrosshair(false); // default this->_is_fullscreen = false; _preferredScreen = QApplication::screens().size() - 1; } @@ -93,10 +93,11 @@ void OutputGLWindow::_updateToPreferredScreen() } -void OutputGLWindow::setDisplayCrosshair(bool crosshair) +void OutputGLWindow::setCanvasDisplayCrosshair(bool crosshair) { canvas->setDisplayCrosshair(crosshair); setCursor(crosshair || this->_is_fullscreen ? Qt::BlankCursor : Qt::ArrowCursor); + qDebug() << "Crosshair " << crosshair; } void OutputGLWindow::setDisplayTestSignal(bool displayTestSignal) diff --git a/OutputGLWindow.h b/OutputGLWindow.h index 19c594f..13c4344 100644 --- a/OutputGLWindow.h +++ b/OutputGLWindow.h @@ -46,7 +46,7 @@ public: public slots: void setFullScreen(bool fullScreen); - void setDisplayCrosshair(bool crosshair); + void setCanvasDisplayCrosshair(bool crosshair); void setDisplayTestSignal(bool displayTestSignal); signals: