fix: animations when entering fullscreen

Author: tomysshadow

FlashpointSecurePlayer/ProgressManager.cs

@@ -300,6 +300,10 @@ private static IntPtr State {
                     return;
                 }
 
+                if (!ProgressBar.IsHandleCreated || ProgressBar.Handle == IntPtr.Zero) {
+                    return;
+                }
+
                 SendMessage(ProgressBar.Handle, PBM_SETSTATE, ProgressManager.state, IntPtr.Zero);
             }
         }

FlashpointSecurePlayer/Shared.cs

@@ -248,6 +248,20 @@ public enum GW : uint {
         [DllImport("USER32.DLL", SetLastError = true)]
         public static extern IntPtr SendMessage(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
 
+        [StructLayout(LayoutKind.Sequential)]
+        public struct POINT {
+            public int x;
+            public int y;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct RECT {
+            public int left;
+            public int right;
+            public int top;
+            public int bottom;
+        }
+
         public enum HookType : int {
             WH_MSGFILTER = -1,
             WH_JOURNALRECORD = 0,
@@ -292,12 +306,6 @@ public enum KBDLLHOOKSTRUCTFlags : uint {
         [DllImport("USER32.DLL")]
         public static extern IntPtr CallNextHookEx(IntPtr hhk, int nCode, IntPtr wParam, KBDLLHOOKSTRUCT lParam);
 
-        [StructLayout(LayoutKind.Sequential)]
-        public struct POINT {
-            public int X;
-            public int Y;
-        }
-
         [StructLayout(LayoutKind.Sequential)]
         public struct MSLLHOOKSTRUCT {
             public POINT pt;
@@ -317,6 +325,42 @@ public struct MSLLHOOKSTRUCT {
         [return: MarshalAs(UnmanagedType.Bool)]
         public static extern bool UnhookWindowsHookEx(IntPtr hhk);
 
+        public enum SW : uint {
+            SW_HIDE = 0,
+            SW_SHOWNORMAL = 1,
+            SW_NORMAL = 1,
+            SW_SHOWMINIMIZED = 2,
+            SW_SHOWMAXIMIZED = 3,
+            SW_MAXIMIZE = 3,
+            SW_SHOWNOACTIVATE = 4,
+            SW_SHOW = 5,
+            SW_MINIMIZE = 6,
+            SW_SHOWMINNOACTIVE = 7,
+            SW_SHOWNA = 8,
+            SW_RESTORE = 9,
+            SW_SHOWDEFAULT = 10,
+            SW_FORCEMINIMIZE = 11,
+            SW_MAX = 11
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct WINDOWPLACEMENT {
+            public int length;
+            public int flags;
+            public SW showCmd;
+            public POINT ptMinPosition;
+            public POINT ptMaxPosition;
+            public RECT rcNormalPosition;
+        }
+
+        [DllImport("USER32.DLL", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool GetWindowPlacement(IntPtr hWnd, ref WINDOWPLACEMENT lpwndpl);
+
+        [DllImport("USER32.DLL", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool SetWindowPlacement(IntPtr hWnd, ref WINDOWPLACEMENT lpwndpl);
+
         [StructLayout(LayoutKind.Sequential)]
         public struct SECURITY_ATTRIBUTES {
             public uint nLength;

FlashpointSecurePlayer/WebBrowserMode.cs

@@ -56,6 +56,34 @@ private IntPtr LowLevelMouseProc(int nCode, IntPtr wParam, IntPtr lParam) {
             return CallNextHookEx(mouseHook, nCode, wParam, lParam);
         }
 
+        public WINDOWPLACEMENT WindowPlacement {
+            get {
+                if (!IsHandleCreated || Handle == IntPtr.Zero) {
+                    throw new NullReferenceException("Handle must not be NULL.");
+                }
+
+                WINDOWPLACEMENT value = new WINDOWPLACEMENT();
+                value.length = Marshal.SizeOf(value);
+
+                if (!GetWindowPlacement(Handle, ref value)) {
+                    Marshal.ThrowExceptionForHR(Marshal.GetHRForLastWin32Error());
+                }
+                return value;
+            }
+
+            set {
+                if (!IsHandleCreated || Handle == IntPtr.Zero) {
+                    throw new NullReferenceException("Handle must not be NULL.");
+                }
+
+                value.length = Marshal.SizeOf(value);
+
+                if (!SetWindowPlacement(Handle, ref value)) {
+                    Marshal.ThrowExceptionForHR(Marshal.GetHRForLastWin32Error());
+                }
+            }
+        }
+
         private const int FULLSCREEN_EXIT_LABEL_TIMER_TIME = 2500;
 
         private System.Windows.Forms.Timer exitFullscreenLabelTimer = null;
@@ -86,12 +114,9 @@ private bool ExitFullscreenLabelTimer {
 
         private bool fullscreen = false;
         private FormBorderStyle fullscreenFormBorderStyle = FormBorderStyle.Sizable;
-        private FormWindowState fullscreenWindowState = FormWindowState.Maximized;
-        private Point fullscreenLocation;
-        private Size fullscreenSize;
+        private WINDOWPLACEMENT fullscreenWindowPlacement;
 
-        private Point closableWebBrowserLocation;
-        private Size closableWebBrowserSize;
+        private Rectangle closableWebBrowserBounds;
 
         // be very careful modifying this property
         // it is very picky about the order things happen
@@ -102,6 +127,10 @@ public bool Fullscreen {
             }
 
             set {
+                if (!IsHandleCreated || Handle == IntPtr.Zero) {
+                    return;
+                }
+
                 if (closableWebBrowser == null) {
                     return;
                 }
@@ -115,19 +144,22 @@ public bool Fullscreen {
                 if (fullscreen) {
                     // get the original properties before modifying them
                     fullscreenFormBorderStyle = FormBorderStyle;
-                    fullscreenWindowState = WindowState;
-                    fullscreenLocation = Location;
-                    fullscreenSize = Size;
+                    fullscreenWindowPlacement = WindowPlacement;
+
+                    closableWebBrowserBounds = closableWebBrowser.Bounds;
 
-                    closableWebBrowserLocation = closableWebBrowser.Location;
-                    closableWebBrowserSize = closableWebBrowser.Size;
+                    WINDOWPLACEMENT windowPlacement = fullscreenWindowPlacement;
 
                     // need to do this first to have an effect if starting maximized
-                    WindowState = FormWindowState.Normal;
+                    windowPlacement.showCmd = SW.SW_NORMAL;
+                    WindowPlacement = windowPlacement;
+
                     // disable resizing
                     FormBorderStyle = FormBorderStyle.None;
+
                     // enter fullscreen
-                    WindowState = FormWindowState.Maximized;
+                    windowPlacement.showCmd = SW.SW_MAXIMIZE;
+                    WindowPlacement = windowPlacement;
 
                     // make strips invisible so the Closable Web Browser can be Docked
                     // (this must happen AFTER entering fullscreen to prevent toolbar mouseover bug)
@@ -157,11 +189,15 @@ public bool Fullscreen {
                         }
                     }
 
+                    WINDOWPLACEMENT windowPlacement = fullscreenWindowPlacement;
+
                     // need to do this first to reset the window to its former size
                     FormBorderStyle = FormBorderStyle.Sizable;
+
                     // exit fullscreen
-                    WindowState = FormWindowState.Normal;
-                    
+                    windowPlacement.showCmd = SW.SW_NORMAL;
+                    WindowPlacement = windowPlacement;
+
                     // make strips visible so the Closable Web Browser can be Anchored
                     fullscreenButton.Checked = false;
                     toolBarToolStrip.Visible = true;
@@ -170,12 +206,9 @@ public bool Fullscreen {
 
                     // reset to the original properties before modifying them
                     FormBorderStyle = fullscreenFormBorderStyle;
-                    WindowState = fullscreenWindowState;
-                    Location = fullscreenLocation;
-                    Size = fullscreenSize;
+                    WindowPlacement = fullscreenWindowPlacement;
 
-                    closableWebBrowser.Location = closableWebBrowserLocation;
-                    closableWebBrowser.Size = closableWebBrowserSize;
+                    closableWebBrowser.Bounds = closableWebBrowserBounds;
 
                     // commit by bringing the window to the front
                     BringToFront();
@@ -545,56 +578,74 @@ private void WebBrowserMode_FormClosing(object sender, FormClosingEventArgs e) {
         private void WebBrowserMode_Activated(object sender, EventArgs e) {
             Application.AddMessageFilter(messageFilter);
 
-            if (Fullscreen) {
-                if (WindowState == FormWindowState.Minimized) {
-                    BringToFront();
-                }
+            if (!IsHandleCreated || Handle == IntPtr.Zero) {
+                return;
+            }
+
+            if (!Fullscreen) {
+                return;
+            }
+            
+            SW showCmd = WindowPlacement.showCmd;
+
+            if (showCmd == SW.SW_SHOWMINIMIZED
+                || showCmd == SW.SW_MINIMIZE
+                || showCmd == SW.SW_SHOWMINNOACTIVE) {
+                BringToFront();
             }
         }
 
         private void WebBrowserMode_Deactivate(object sender, EventArgs e) {
             Application.RemoveMessageFilter(messageFilter);
 
-            if (Fullscreen) {
-                IntPtr foregroundWindow = GetForegroundWindow();
-
-                // we are the active window, because we are only now deactivating
-                // if this process has the foreground window, it'll be the active window
-                if (Handle == foregroundWindow) {
-                    // this process opened a new window
-                    if (!CanFocus) {
-                        // if there is a window above us in the z-order
-                        IntPtr previousWindow = GetWindow(Handle, GW.GW_HWNDPREV);
-
-                        if (previousWindow != IntPtr.Zero) {
-                            // if we own the window above us in the z-order
-                            if (Handle == GetWindow(previousWindow, GW.GW_OWNER)) {
-                                // the new window is a dialog that prevents focus to this window
-                                return;
-                            }
-                        }
-                    }
+            if (!IsHandleCreated || Handle == IntPtr.Zero) {
+                return;
+            }
 
-                    // the new window is not a dialog that prevents focus to this window
-                    Fullscreen = false;
-                    return;
-                }
+            if (!Fullscreen) {
+                return;
+            }
 
-                // another process opened a window
-                if (foregroundWindow != IntPtr.Zero) {
-                    // if we own the foreground window
-                    if (Handle == GetWindow(foregroundWindow, GW.GW_OWNER)) {
-                        // the new window is owned by this window
-                        if (CanFocus) {
-                            // the new window is not a dialog that prevents focus to this window
-                            Fullscreen = false;
+            IntPtr foregroundWindow = GetForegroundWindow();
+
+            // we are the active window, because we are only now deactivating
+            // if this process has the foreground window, it'll be the active window
+            if (Handle == foregroundWindow) {
+                // this process opened a new window
+                if (!CanFocus) {
+                    // if there is a window above us in the z-order
+                    IntPtr previousWindow = GetWindow(Handle, GW.GW_HWNDPREV);
+
+                    if (previousWindow != IntPtr.Zero) {
+                        // if we own the window above us in the z-order
+                        if (Handle == GetWindow(previousWindow, GW.GW_OWNER)) {
+                            // the new window is a dialog that prevents focus to this window
+                            return;
                         }
-                        return;
                     }
                 }
 
-                WindowState = FormWindowState.Minimized;
+                // the new window is not a dialog that prevents focus to this window
+                Fullscreen = false;
+                return;
+            }
+
+            // another process opened a window
+            if (foregroundWindow != IntPtr.Zero) {
+                // if we own the foreground window
+                if (Handle == GetWindow(foregroundWindow, GW.GW_OWNER)) {
+                    // the new window is owned by this window
+                    if (CanFocus) {
+                        // the new window is not a dialog that prevents focus to this window
+                        Fullscreen = false;
+                    }
+                    return;
+                }
             }
+
+            WINDOWPLACEMENT windowPlacement = WindowPlacement;
+            windowPlacement.showCmd = SW.SW_MINIMIZE;
+            WindowPlacement = windowPlacement;
         }
 
         private void closableWebBrowser_Navigated(object sender, WebBrowserNavigatedEventArgs e) {
@@ -685,7 +736,7 @@ private void closableWebBrowser_WebBrowserPaint(object sender, EventArgs e) {
             // lame fix: browser hangs when window.open top attribute > control height (why?)
             // Width, Height, and WindowState changes all work here
             // Width/Height are less obvious and Height doesn't cause text reflow
-            if (WindowState != FormWindowState.Maximized) {
+            if (WindowPlacement.showCmd != SW.SW_SHOWMAXIMIZED) {
                 // add first in case it's zero
                 Height++;
                 Height--;