hide fullscreen label on keypress

Author: tomysshadow

FlashpointSecurePlayer/Shared.cs

@@ -158,6 +158,10 @@ public static void LogExceptionToLauncher(Exception ex) {
 
         public const int WM_DESTROY = 0x00000002;
         public const int WM_PAINT = 0x0000000F;
+        public const int WM_KEYDOWN = 0x00000100;
+        public const int WM_KEYUP = 0x00000101;
+        public const int WM_SYSKEYDOWN = 0x00000104;
+        public const int WM_SYSKEYUP = 0x00000105;
         public const int WM_MOUSEMOVE = 0x00000200;
         public const int WM_LBUTTONUP = 0x00000202;
         public const int WM_RBUTTONUP = 0x00000205;

FlashpointSecurePlayer/WebBrowserMode.cs

@@ -230,6 +230,8 @@ private class MessageFilter : IMessageFilter {
             private readonly EventHandler back;
             private readonly EventHandler forward;
 
+            public bool ProcessedCmdKeyFullscreen { get; set; } = false;
+
             public MessageFilter(EventHandler stopExitFullscreenLabelTimer, EventHandler back, EventHandler forward) {
                 this.stopExitFullscreenLabelTimer = stopExitFullscreenLabelTimer;
                 this.back = back;
@@ -274,6 +276,16 @@ public bool PreFilterMessage(ref Message m) {
                 // mouse buttons shouldn't navigate both the
                 // main and popup windows
                 switch (m.Msg) {
+                    case WM_KEYDOWN:
+                    case WM_SYSKEYDOWN:
+                    ProcessedCmdKeyFullscreen = false;
+                    return false;
+                    case WM_KEYUP:
+                    case WM_SYSKEYUP:
+                    if (!ProcessedCmdKeyFullscreen) {
+                        OnStopExitFullscreenLabelTimer(EventArgs.Empty);
+                    }
+                    return false;
                     case WM_LBUTTONUP:
                     case WM_RBUTTONUP:
                     case WM_MBUTTONUP:
@@ -620,7 +632,9 @@ private void WebBrowserMode_FormClosing(object sender, FormClosingEventArgs e) {
         }
 
         private void WebBrowserMode_Activated(object sender, EventArgs e) {
-            Application.AddMessageFilter(messageFilter);
+            if (messageFilter != null) {
+                Application.AddMessageFilter(messageFilter);
+            }
 
             if (!IsHandleCreated || Handle == IntPtr.Zero) {
                 return;
@@ -640,7 +654,9 @@ private void WebBrowserMode_Activated(object sender, EventArgs e) {
         }
 
         private void WebBrowserMode_Deactivate(object sender, EventArgs e) {
-            Application.RemoveMessageFilter(messageFilter);
+            if (messageFilter != null) {
+                Application.RemoveMessageFilter(messageFilter);
+            }
 
             if (!IsHandleCreated || Handle == IntPtr.Zero) {
                 return;
@@ -1011,6 +1027,10 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData) {
                     return true;
                     case Keys.F11:
                     case Keys.Alt | Keys.Enter:
+                    if (messageFilter != null) {
+                        messageFilter.ProcessedCmdKeyFullscreen = true;
+                    }
+
                     BrowserFullscreen();
                     return true;
                 }