From b2baddc40bb62f129b8fa749269dd4d9dea5f9d3 Mon Sep 17 00:00:00 2001
From: shun_iwasawa <shun_iwasawa@dwango.co.jp>
Date: Oct 18 2017 11:45:22 +0000
Subject: fix fullscreen


---

diff --git a/toonz/sources/toonz/sceneviewer.cpp b/toonz/sources/toonz/sceneviewer.cpp
index 938c85b..84c7b18 100644
--- a/toonz/sources/toonz/sceneviewer.cpp
+++ b/toonz/sources/toonz/sceneviewer.cpp
@@ -1400,10 +1400,7 @@ void SceneViewer::paintGL() {
      * GL_FRAMEBUFFER_UNDEFINED の状態で paintGL() が呼ばれてしまうようだ */
     return;
   }
-#ifdef WIN32
-  // following line is necessary to solve a problem Windows 7
-  SetWindowRgn((HWND)winId(), 0, FALSE);
-#else
+#ifdef MACOSX
   // followin lines are necessary to solve a problem on iMac20
   // It seems that for some errors in the openGl implementation, buffers are not
   // set corretly.
diff --git a/toonz/sources/toonzqt/imageutils.cpp b/toonz/sources/toonzqt/imageutils.cpp
index fe66dbb..2d31362 100644
--- a/toonz/sources/toonzqt/imageutils.cpp
+++ b/toonz/sources/toonzqt/imageutils.cpp
@@ -41,6 +41,9 @@
 
 // TnzQt includes
 #include <QApplication>
+#ifdef _WIN32
+#include <QtPlatformHeaders/QWindowsWindowFunctions>
+#endif
 
 // boost includes
 #include <boost/iterator/transform_iterator.hpp>
@@ -808,6 +811,12 @@ FullScreenWidget::FullScreenWidget(QWidget *parent) : QWidget(parent) {
   layout->setSpacing(0);
 
   setLayout(layout);
+
+#ifdef _WIN32
+  // http://doc.qt.io/qt-5/windows-issues.html#fullscreen-opengl-based-windows
+  winId();
+  QWindowsWindowFunctions::setHasBorderInFullScreen(windowHandle(), true);
+#endif
 }
 
 //---------------------------------------------------------------------------------
@@ -826,13 +835,9 @@ bool FullScreenWidget::toggleFullScreen(bool quit) {
     hide();
     setWindowFlags(windowFlags() & ~(Qt::Window | Qt::WindowStaysOnTopHint));
     showNormal();
-
-    setContentsMargins(0, 0, 0, 0);  // ...
     m_widget->setFocus();
     return true;
   } else if (!quit) {
-    setContentsMargins(0, 0, 1, 1);  // QTBUG #7556
-
     setWindowFlags(windowFlags() | Qt::Window | Qt::WindowStaysOnTopHint);
     showFullScreen();