From fcf4c51193086b2c82bfbe4c06f96eb548967af5 Mon Sep 17 00:00:00 2001
From: Tats <info@sofianaudry.com>
Date: Sat, 26 Mar 2016 18:15:18 -0400
Subject: [PATCH] Moved crosshair check into OutputGLWindow.

---
 MainWindow.cpp     |  2 ++
 OutputGLWindow.cpp | 25 ++++++++++++++-----------
 OutputGLWindow.h   |  3 +--
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/MainWindow.cpp b/MainWindow.cpp
index 8bed600..7c54162 100644
--- a/MainWindow.cpp
+++ b/MainWindow.cpp
@@ -1651,6 +1651,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)));
 
   // Toggle sticky vertices
   stickyVerticesAction = new QAction(tr("&Sticky Vertices"), this);
@@ -1991,6 +1992,7 @@ void MainWindow::writeSettings()
   settings.setValue("outputWindow", outputWindow->saveGeometry());
   settings.setValue("displayOutputWindow", outputFullScreenAction->isChecked());
   settings.setValue("displayTestSignal", displayTestSignalAction->isChecked());
+  settings.setValue("displayControls", displayControlsAction->isChecked());
   settings.setValue("osc_receive_port", config_osc_receive_port);
   settings.setValue("displayUndoStack", displayUndoStackAction->isChecked());
   settings.setValue("zoomToolBar", displayZoomToolAction->isChecked());
diff --git a/OutputGLWindow.cpp b/OutputGLWindow.cpp
index b3b6098..2d56cb8 100644
--- a/OutputGLWindow.cpp
+++ b/OutputGLWindow.cpp
@@ -38,7 +38,7 @@ OutputGLWindow:: OutputGLWindow(QWidget* parent, const MapperGLCanvas* canvas_)
   layout->addWidget(canvas);
   setLayout(layout);
 
-  _pointerIsVisible = true;
+  setDisplayCrosshair(false); // default
 }
 
 //OutputGLWindow::OutputGLWindow(MainWindow* mainWindow, QWidget* parent, const QGLWidget * shareWidget) : QDialog(parent)
@@ -61,21 +61,11 @@ OutputGLWindow:: OutputGLWindow(QWidget* parent, const MapperGLCanvas* canvas_)
 //
 //}
 
-void OutputGLWindow::setCursorVisible(bool visible)
 {
-  _pointerIsVisible = visible;
 
-  if (_pointerIsVisible)
   {
-    this->setCursor(Qt::ArrowCursor);
-    _pointerIsVisible = true;
   }
   else
-  {
-    this->setCursor(Qt::ArrowCursor);
-    this->setCursor(Qt::BlankCursor);
-    _pointerIsVisible = false;
-  }
 }
 
 void OutputGLWindow::closeEvent(QCloseEvent *event)
@@ -115,6 +105,19 @@ void OutputGLWindow::setFullScreen(bool fullscreen)
 #else
     showNormal();
 #endif
+
+void OutputGLWindow::setDisplayCrosshair(bool crosshair)
+{
+  canvas->setDisplayCrosshair(crosshair);
+
+  if (crosshair)
+  {
+//    this->setCursor(Qt::ArrowCursor);
+    setCursor(Qt::BlankCursor);
+  }
+  else
+  {
+    setCursor(Qt::ArrowCursor);
   }
 }
 
diff --git a/OutputGLWindow.h b/OutputGLWindow.h
index 865cd0d..3ab0974 100644
--- a/OutputGLWindow.h
+++ b/OutputGLWindow.h
@@ -46,6 +46,7 @@ public:
 
 public slots:
   void setFullScreen(bool fullScreen);
+  void setDisplayCrosshair(bool crosshair);
   void setDisplayTestSignal(bool displayTestSignal);
 
 protected:
@@ -57,12 +58,10 @@ signals:
 public:
   MapperGLCanvas* getCanvas() const { return canvas; }
   void setPointerHasMoved();
-  void setCursorVisible(bool visible);
 
 private:
   OutputGLCanvas* canvas;
 
-  bool _pointerIsVisible;
 };
 
 MM_END_NAMESPACE