When opening the map window focus is returned to the main OR game window. This can cause confusion when running in full screen mode. In that case the map window will be hidden behind the game window. Therefore this bug fix does not refoucus when (part) of the map window is overlapping the game window.

Author: sweiland-openrails

Source/RunActivity/Viewer3D/Map/MapForm.cs

@@ -1345,7 +1345,12 @@ void UITimer_Tick(object sender, EventArgs e)
             if (Viewer.MapViewerEnabledSetToTrue)
             {
                 GenerateView();
-                GameForm.Focus();
+                if (!mapBehindGameForm())
+                {
+                    // do not return focus to the main OR game window
+                    // when map is (partially) overlapping the game window
+                    GameForm.Focus();
+                }
                 Viewer.MapViewerEnabledSetToTrue = false;
             }
 
@@ -1357,6 +1362,25 @@ void UITimer_Tick(object sender, EventArgs e)
             GenerateView();
         }
 
+        private bool mapBehindGameForm()
+        {        
+            int mapX0 = Bounds.X;
+            int mapY0 = Bounds.Y;
+            int mapX1 = mapX0 + Size.Width;
+            int mapY1 = mapY0 + Size.Height;
+
+            int gameX0 = GameForm.Bounds.X;
+            int gameY0 = GameForm.Bounds.Y;
+            int gameX1 = GameForm.Size.Width;
+            int gameY1 = GameForm.Size.Height;
+
+            return
+                ((mapX0 >= gameX0) && (mapX0 <= gameX1)) && ((mapY0 >= gameY0) && (mapY0 <= gameY1)) ||
+                ((mapX0 >= gameX0) && (mapX0 <= gameX1)) && ((mapY1 >= gameY0) && (mapY1 <= gameY1)) ||
+                ((mapX1 >= gameX0) && (mapX1 <= gameX1)) && ((mapY0 >= gameY0) && (mapY0 <= gameY1)) ||
+                ((mapX1 >= gameX0) && (mapX1 <= gameX1)) && ((mapY1 >= gameY0) && (mapY1 <= gameY1));
+        }
+
         private void allowJoiningCheckbox_CheckedChanged(object sender, EventArgs e)
         {
             MPManager.Instance().AllowNewPlayer = allowJoiningCheckbox.Checked;