From c5731cb986e7d7fca2f88af195113eefb6a54b06 Mon Sep 17 00:00:00 2001
From: the_fiddler <the_fiddler@ebc5dd9b-fb1d-0410-b6f8-d24c324e9604>
Date: Mon, 21 Apr 2008 18:36:16 +0000
Subject: [PATCH] Completed WindowBorder and WindowState implementation.

---
 Source/OpenTK/Platform/Windows/WinGLNative.cs | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/Source/OpenTK/Platform/Windows/WinGLNative.cs b/Source/OpenTK/Platform/Windows/WinGLNative.cs
index e3282b5e..c8ed7895 100644
--- a/Source/OpenTK/Platform/Windows/WinGLNative.cs
+++ b/Source/OpenTK/Platform/Windows/WinGLNative.cs
@@ -450,6 +450,9 @@ namespace OpenTK.Platform.Windows
             }
             set
             {
+                if (WindowState == value)
+                    return;
+
                 IntPtr style = Functions.GetWindowLong(Handle, GetWindowLongOffsets.STYLE);
                 ShowWindowCommand command = (ShowWindowCommand)0;
                 SetWindowPosFlags flags = SetWindowPosFlags.NOREPOSITION;
@@ -460,6 +463,10 @@ namespace OpenTK.Platform.Windows
                     case WindowState.Normal:
                         command = ShowWindowCommand.RESTORE;
                         flags |= SetWindowPosFlags.SHOWWINDOW | SetWindowPosFlags.FRAMECHANGED;
+
+                        if (WindowState == WindowState.Fullscreen || WindowState == WindowState.Maximized)
+                            WindowBorder = previous_window_border;
+
                         new_width = previous_client_area.Width;
                         new_height = previous_client_area.Height;
                         break;
@@ -471,21 +478,20 @@ namespace OpenTK.Platform.Windows
 
                     case WindowState.Maximized:
                     case WindowState.Fullscreen:
-                        if (windowState == WindowState.Normal || windowState == WindowState.Minimized)
+                        if (WindowState == WindowState.Normal || WindowState == WindowState.Minimized)
                         {
                             // Get the normal size of the window, so we can set it when reverting from fullscreen/maximized to normal.
-                            previous_client_area = new Rectangle(width, height);
-                            previous_window_border = windowBorder;
-                            //Functions.AdjustWindowRect(ref previous_client_area, WindowStyle.OverlappedWindow, false);
+                            previous_client_area = new Rectangle(window_size.Width, window_size.Height);
+                            previous_window_border = WindowBorder;
                         }
 
                         command = ShowWindowCommand.SHOWMAXIMIZED;
                         flags |= SetWindowPosFlags.SHOWWINDOW | SetWindowPosFlags.DRAWFRAME | SetWindowPosFlags.NOSIZE;
 
                         if (value == WindowState.Fullscreen)
-                            windowBorder = WindowBorder.Hidden;
+                            this.WindowBorder = WindowBorder.Hidden;
                         else
-                            windowBorder = previous_window_border;
+                            this.WindowBorder = previous_window_border;
 
                         break;
                 }
@@ -525,12 +531,13 @@ namespace OpenTK.Platform.Windows
                         break;
 
                     case WindowBorder.Hidden:
-                        style &= WindowStyle.Popup;
+                        style |= WindowStyle.Popup;
                         break;
                 }
 
                 Functions.SetWindowLong(Handle, GetWindowLongOffsets.STYLE, (IntPtr)(int)style);
 
+                windowBorder = value;
             }
         }