From 6167469bbdad5c69b306dd58e59b3a1e831c3833 Mon Sep 17 00:00:00 2001
From: Andrey Kamaev <no@email>
Date: Sun, 11 Sep 2011 18:54:25 +0000
Subject: [PATCH] Fixed fullscreen window mode on Windows.

---
 modules/highgui/src/precomp.hpp    | 20 ++++++++++----------
 modules/highgui/src/window_w32.cpp |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/modules/highgui/src/precomp.hpp b/modules/highgui/src/precomp.hpp
index 87e6cac..13055c7 100644
--- a/modules/highgui/src/precomp.hpp
+++ b/modules/highgui/src/precomp.hpp
@@ -48,6 +48,16 @@
 
 #include "cvconfig.h"
 
+#if defined WIN32 || defined _WIN32
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#undef min
+#undef max
+
+void  FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origin );
+#endif
+
 #include "opencv2/highgui/highgui.hpp"
 #include "opencv2/highgui/highgui_c.h"
 #include "opencv2/imgproc/imgproc_c.h"
@@ -64,16 +74,6 @@
 #include "opencv2/highgui/highgui_tegra.hpp"
 #endif
 
-#if defined WIN32 || defined _WIN32
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef min
-#undef max
-
-void  FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origin );
-#endif
-
 /* Errors */
 #define HG_OK          0 /* Don't bet on it! */
 #define HG_BADNAME    -1 /* Bad window or file name */
diff --git a/modules/highgui/src/window_w32.cpp b/modules/highgui/src/window_w32.cpp
index 0a2dc10..00342db 100644
--- a/modules/highgui/src/window_w32.cpp
+++ b/modules/highgui/src/window_w32.cpp
@@ -420,7 +420,7 @@ void cvSetModeWindow_W32( const char* name, double prop_value)//Yannick Verdie
 		if (window->status==CV_WINDOW_FULLSCREEN && prop_value==CV_WINDOW_NORMAL)
 		{
 			icvLoadWindowPos(window->name,position );
-			SetWindowLongPtr(window->frame, GWL_STYLE, dwStyle | WS_CAPTION);
+			SetWindowLongPtr(window->frame, GWL_STYLE, dwStyle | WS_CAPTION | WS_THICKFRAME);
 
 			SetWindowPos(window->frame, HWND_TOP, position.x, position.y , position.width,position.height, SWP_NOZORDER | SWP_FRAMECHANGED);
 			window->status=CV_WINDOW_NORMAL;
@@ -447,7 +447,7 @@ void cvSetModeWindow_W32( const char* name, double prop_value)//Yannick Verdie
 			//fullscreen
 			position.x=mi.rcMonitor.left;position.y=mi.rcMonitor.top;
 			position.width=mi.rcMonitor.right - mi.rcMonitor.left;position.height=mi.rcMonitor.bottom - mi.rcMonitor.top;
-			SetWindowLongPtr(window->frame, GWL_STYLE, dwStyle & ~WS_CAPTION);
+			SetWindowLongPtr(window->frame, GWL_STYLE, dwStyle & ~WS_CAPTION & ~WS_THICKFRAME);
 
 			SetWindowPos(window->frame, HWND_TOP, position.x, position.y , position.width,position.height, SWP_NOZORDER | SWP_FRAMECHANGED);
 			window->status=CV_WINDOW_FULLSCREEN;
-- 
2.7.4