UX tweak: hide the fullscreen label on click

Author: tomysshadow

FlashpointSecurePlayer/Shared.cs

@@ -159,11 +159,14 @@ public static void LogExceptionToLauncher(Exception ex) {
         public const int WM_DESTROY = 0x00000002;
         public const int WM_PAINT = 0x0000000F;
         public const int WM_MOUSEMOVE = 0x00000200;
+        public const int WM_LBUTTONUP = 0x00000202;
+        public const int WM_RBUTTONUP = 0x00000205;
+        public const int WM_MBUTTONUP = 0x00000208;
         public const int WM_XBUTTONUP = 0x0000020C;
         public const int WM_PARENTNOTIFY = 0x00000210;
 
-        public const int MK_XBUTTON1 = 0x00010000;
-        public const int MK_XBUTTON2 = 0x00020000;
+        public const int XBUTTON1 = 0x00010000;
+        public const int XBUTTON2 = 0x00020000;
 
         public const int S_OK = unchecked((int)0x00000000);
         public const int S_FALSE = unchecked((int)0x00000001);

FlashpointSecurePlayer/WebBrowserMode.cs

@@ -94,7 +94,12 @@ private bool ExitFullscreenLabelTimer {
             }
 
             set {
-                if (exitFullscreenLabelTimer != null) {
+                if (exitFullscreenLabelTimer == null) {
+                    if (!value) {
+                        // timer not started, already hidden
+                        return;
+                    }
+                } else {
                     exitFullscreenLabelTimer.Stop();
                     exitFullscreenLabelTimer.Tick -= exitFullscreenLabelTimer_Tick;
                     exitFullscreenLabelTimer.Dispose();
@@ -221,14 +226,26 @@ public bool Fullscreen {
         }
 
         private class MessageFilter : IMessageFilter {
+            private readonly EventHandler stopExitFullscreenLabelTimer;
             private readonly EventHandler back;
             private readonly EventHandler forward;
 
-            public MessageFilter(EventHandler back, EventHandler forward) {
+            public MessageFilter(EventHandler stopExitFullscreenLabelTimer, EventHandler back, EventHandler forward) {
+                this.stopExitFullscreenLabelTimer = stopExitFullscreenLabelTimer;
                 this.back = back;
                 this.forward = forward;
             }
 
+            private void OnStopExitFullscreenLabelTimer(EventArgs e) {
+                EventHandler eventHandler = stopExitFullscreenLabelTimer;
+
+                if (eventHandler == null) {
+                    return;
+                }
+
+                eventHandler(this, e);
+            }
+
             private void OnBack(EventArgs e) {
                 EventHandler eventHandler = back;
 
@@ -256,18 +273,25 @@ public bool PreFilterMessage(ref Message m) {
                 // for example, if there is a popup, the
                 // mouse buttons shouldn't navigate both the
                 // main and popup windows
-                if (m.Msg == WM_XBUTTONUP) {
+                switch (m.Msg) {
+                    case WM_LBUTTONUP:
+                    case WM_RBUTTONUP:
+                    case WM_MBUTTONUP:
+                    OnStopExitFullscreenLabelTimer(EventArgs.Empty);
+                    return false;
+                    case WM_XBUTTONUP:
                     int wParam = m.WParam.ToInt32();
 
-                    if ((wParam & MK_XBUTTON1) == MK_XBUTTON1) {
+                    if ((wParam & XBUTTON1) == XBUTTON1) {
                         OnBack(EventArgs.Empty);
                         return true;
                     }
 
-                    if ((wParam & MK_XBUTTON2) == MK_XBUTTON2) {
+                    if ((wParam & XBUTTON2) == XBUTTON2) {
                         OnForward(EventArgs.Empty);
                         return true;
                     }
+                    return false;
                 }
                 return false;
             }
@@ -362,7 +386,7 @@ public WebBrowserMode(bool useFlashActiveXControl = false) {
             UseFlashActiveXControl = useFlashActiveXControl;
 
             lowLevelMouseProc = new HookProc(LowLevelMouseProc);
-            messageFilter = new MessageFilter(Back, Forward);
+            messageFilter = new MessageFilter(StopExitFullscreenLabelTimer, Back, Forward);
             webBrowserModeTitle = new WebBrowserModeTitle(TitleChanged);
 
             statusBarStatusStrip.Renderer = new EndEllipsisTextRenderer();
@@ -375,7 +399,7 @@ public WebBrowserMode(Uri webBrowserURL, bool useFlashActiveXControl = false) {
             UseFlashActiveXControl = useFlashActiveXControl;
 
             lowLevelMouseProc = new HookProc(LowLevelMouseProc);
-            messageFilter = new MessageFilter(Back, Forward);
+            messageFilter = new MessageFilter(StopExitFullscreenLabelTimer, Back, Forward);
             webBrowserModeTitle = new WebBrowserModeTitle(TitleChanged);
 
             statusBarStatusStrip.Renderer = new EndEllipsisTextRenderer();
@@ -474,6 +498,10 @@ public void BrowserFullscreen() {
             Fullscreen = !Fullscreen;
         }
 
+        private void StopExitFullscreenLabelTimer(object sender, EventArgs e) {
+            ExitFullscreenLabelTimer = false;
+        }
+
         private void Back(object sender, EventArgs e) {
             BrowserBack();
         }