From 94e2902fbaea1ea594a278a534c138d21f7dec7e Mon Sep 17 00:00:00 2001 From: Bloody Mess <> Date: Feb 27 2021 04:42:22 +0000 Subject: Merged changes from "fix window disappearing on undock" for windows build. --- diff --git a/toonz/sources/toonzqt/imageutils.cpp b/toonz/sources/toonzqt/imageutils.cpp index a22bf91..d2bee7e 100644 --- a/toonz/sources/toonzqt/imageutils.cpp +++ b/toonz/sources/toonzqt/imageutils.cpp @@ -965,6 +965,7 @@ void FullScreenWidget::setWidget(QWidget *widget) { // application is in the process of quiting. if (!kfApplicationQuitInProgress) { +#if !defined( _WIN32 ) //============================================================== // // NOTE: @@ -1052,6 +1053,15 @@ void FullScreenWidget::setWidget(QWidget *widget) { } } } +#else + this->setWindowFlags( this->windowFlags() | Qt::Window | Qt::WindowStaysOnTopHint ); + + // http://doc.qt.io/qt-5/windows-issues.html#fullscreen-opengl-based-windows + this->winId(); + QWindowsWindowFunctions::setHasBorderInFullScreen( this->windowHandle(), true ); + + this->showFullScreen(); +#endif // Set the return value to indicate that the full screen mode has been changed.