From 45b31a49e1c5f5ce1bcff2437a393b1be10dfc1a Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Thu, 17 Jan 2019 12:11:06 +1100
Subject: [PATCH] added full screen disable option

---
 project/effect.cpp  |  1 -
 ui/viewerwidget.cpp | 28 ++++++++++++++++++++--------
 ui/viewerwidget.h   |  1 +
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/project/effect.cpp b/project/effect.cpp
index fa72412ee..e777335c1 100644
--- a/project/effect.cpp
+++ b/project/effect.cpp
@@ -922,7 +922,6 @@ GLuint Effect::process_superimpose(double timecode) {
 	}
 
 	if (valueHasChanged(timecode) || recreate_texture || enable_always_update) {
-		qDebug() << "redrew";
 		redraw(timecode);
 	}
 
diff --git a/ui/viewerwidget.cpp b/ui/viewerwidget.cpp
index d7f5d0b59..5232663e1 100644
--- a/ui/viewerwidget.cpp
+++ b/ui/viewerwidget.cpp
@@ -104,6 +104,9 @@ void ViewerWidget::show_context_menu() {
 	connect(show_fullscreen_action, SIGNAL(triggered()), this, SLOT(show_fullscreen()));*/
 	QMenu* fullscreen_menu = menu.addMenu(tr("Show Fullscreen"));
 	QList<QScreen*> screens = QGuiApplication::screens();
+	if (window != nullptr && window->isVisible()) {
+		fullscreen_menu->addAction(tr("Disable"));
+	}
 	for (int i=0;i<screens.size();i++) {
 		QAction* screen_action = fullscreen_menu->addAction(tr("Screen %1: %2x%3").arg(
 																QString::number(i),
@@ -162,12 +165,16 @@ void ViewerWidget::fullscreen_menu_action(QAction *action) {
 	if (window == nullptr) {
 		QMessageBox::critical(this, "Error", "Failed to create viewer window");
 	} else {
-		QScreen* selected_screen = QGuiApplication::screens().at(action->data().toInt());
-		window->showFullScreen();
-		window->setGeometry(selected_screen->geometry());
+		if (action->data().isNull()) {
+			window->hide();
+		} else {
+			QScreen* selected_screen = QGuiApplication::screens().at(action->data().toInt());
+			window->showFullScreen();
+			window->setGeometry(selected_screen->geometry());
 
-		// HACK: window seems to show with distorted texture on first showing, so we queue an update after it's shown
-		QTimer::singleShot(100, window, SLOT(update()));
+			// HACK: window seems to show with distorted texture on first showing, so we queue an update after it's shown
+			QTimer::singleShot(100, window, SLOT(update()));
+		}
 	}
 }
 
@@ -205,9 +212,8 @@ void ViewerWidget::retry() {
 void ViewerWidget::initializeGL() {
 	initializeOpenGLFunctions();
 
-	if (window != nullptr) {
-		delete window;
-	}
+	connect(context(), SIGNAL(aboutToBeDestroyed()), this, SLOT(context_destroy()), Qt::DirectConnection);
+
 	window = new ViewerWindow(context());
 }
 
@@ -246,6 +252,12 @@ void ViewerWidget::seek_from_click(int x) {
 	viewer->seek(getFrameFromScreenPoint(waveform_zoom, x+waveform_scroll));
 }
 
+void ViewerWidget::context_destroy() {
+	if (window != nullptr) {
+		delete window;
+	}
+}
+
 EffectGizmo* ViewerWidget::get_gizmo_from_mouse(int x, int y) {
 	if (gizmos != nullptr) {
 		double multiplier = double(viewer->seq->width) / double(width());
diff --git a/ui/viewerwidget.h b/ui/viewerwidget.h
index 980e88dec..b09b6dd1f 100644
--- a/ui/viewerwidget.h
+++ b/ui/viewerwidget.h
@@ -66,6 +66,7 @@ private:
 	RenderThread* renderer;
 	ViewerWindow* window;
 private slots:
+	void context_destroy();
 	void retry();
 	void show_context_menu();
 	void save_frame();