diff --git a/MainWindow.cpp b/MainWindow.cpp index 70e08ea..4b5cee8 100644 --- a/MainWindow.cpp +++ b/MainWindow.cpp @@ -1181,12 +1181,12 @@ void MainWindow::createActions() connect(displayOutputWindow, SIGNAL(toggled(bool)), outputWindowFullScreen, SLOT(setEnabled(bool))); - outputWindowHasCursor = new QAction(tr("O&utput window has cursor"), this); - outputWindowHasCursor->setStatusTip(tr("Show cursor in output window")); - outputWindowHasCursor->setIconVisibleInMenu(false); - outputWindowHasCursor->setCheckable(true); - outputWindowHasCursor->setChecked(true); - connect(outputWindowHasCursor, SIGNAL(toggled(bool)), outputWindow, SLOT(setFullScreen(bool))); + // outputWindowHasCursor = new QAction(tr("O&utput window has cursor"), this); + // outputWindowHasCursor->setStatusTip(tr("Show cursor in output window")); + // outputWindowHasCursor->setIconVisibleInMenu(false); + // outputWindowHasCursor->setCheckable(true); + // outputWindowHasCursor->setChecked(true); + // connect(outputWindowHasCursor, SIGNAL(toggled(bool)), outputWindow, SLOT(setFullScreen(bool))); // Toggle display of canvas controls. displayCanvasControls = new QAction(tr("&Display canvas controls"), this); @@ -1262,7 +1262,7 @@ void MainWindow::createMenus() viewMenu->addAction(outputWindowFullScreen); viewMenu->addAction(displayCanvasControls); viewMenu->addAction(stickyVertices); - viewMenu->addAction(outputWindowHasCursor); + //viewMenu->addAction(outputWindowHasCursor); // Run. runMenu = menuBar->addMenu(tr("&Run")); diff --git a/MainWindow.h b/MainWindow.h index 33443cc..54ac351 100644 --- a/MainWindow.h +++ b/MainWindow.h @@ -256,7 +256,7 @@ private: QAction *rewindAction; QAction *displayOutputWindow; - QAction *outputWindowHasCursor; + //QAction *outputWindowHasCursor; QAction *outputWindowFullScreen; QAction *displayCanvasControls; QAction *stickyVertices; diff --git a/OutputGLWindow.cpp b/OutputGLWindow.cpp index f446628..4a58770 100644 --- a/OutputGLWindow.cpp +++ b/OutputGLWindow.cpp @@ -46,13 +46,13 @@ void OutputGLWindow::setCursorVisible(bool visible) if (_pointerIsVisible) { - this->setCursor(Qt::BlankCursor); - _pointerIsVisible = false; + this->setCursor(Qt::ArrowCursor); + _pointerIsVisible = true; } else { - this->setCursor(Qt::ArrowCursor); - _pointerIsVisible = true; + this->setCursor(Qt::BlankCursor); + _pointerIsVisible = false; } } diff --git a/OutputGLWindow.h b/OutputGLWindow.h index afaa678..768df62 100644 --- a/OutputGLWindow.h +++ b/OutputGLWindow.h @@ -38,7 +38,6 @@ public: public slots: void setFullScreen(bool fullScreen); - void setCursorVisible(bool visible); protected: void closeEvent(QCloseEvent* event); @@ -51,6 +50,7 @@ signals: public: DestinationGLCanvas* getCanvas() const { return canvas; } void setPointerHasMoved(); + void setCursorVisible(bool visible); private: DestinationGLCanvas* canvas;