From 2c5dd22a9cd51568e0b8383d61cbb83105f0f6e2 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Thu, 17 Jan 2019 12:45:55 +1100 Subject: [PATCH] close fullscreen when closing the app --- mainwindow.cpp | 3 +++ ui/viewerwidget.cpp | 4 ++++ ui/viewerwidget.h | 1 + 3 files changed, 8 insertions(+) diff --git a/mainwindow.cpp b/mainwindow.cpp index 9e7b99233..8105e87f6 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -981,6 +981,9 @@ void MainWindow::closeEvent(QCloseEvent *e) { set_sequence(nullptr); + panel_footage_viewer->viewer_widget->close_window(); + panel_sequence_viewer->viewer_widget->close_window(); + panel_footage_viewer->set_main_sequence(); QString data_dir = get_data_path(); diff --git a/ui/viewerwidget.cpp b/ui/viewerwidget.cpp index 35a61be02..220779f8b 100644 --- a/ui/viewerwidget.cpp +++ b/ui/viewerwidget.cpp @@ -375,6 +375,10 @@ void ViewerWidget::mouseReleaseEvent(QMouseEvent *event) { dragging = false; } +void ViewerWidget::close_window() { + if (window != nullptr) window->hide(); +} + void ViewerWidget::draw_waveform_func() { QPainter p(this); if (viewer->seq->using_workarea) { diff --git a/ui/viewerwidget.h b/ui/viewerwidget.h index b09b6dd1f..a4909ac5f 100644 --- a/ui/viewerwidget.h +++ b/ui/viewerwidget.h @@ -29,6 +29,7 @@ public: ~ViewerWidget(); void delete_function(); + void close_window(); void paintGL(); void initializeGL();