Automatic merge of T1.5.1-1076-g60df6ba81e and 22 pull requests

- Pull request #799 at dfc715e: Consolidated wind simulation
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
- Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder
- Pull request #882 at 8f695a4: Blueprint/train car operations UI window
- Pull request #885 at e267870: feat: Add notifications to Menu
- Pull request #891 at 9a1d6b2: Auto save
- Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH
- Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
- Pull request #900 at c27f32d: DMI updates
- Pull request #903 at 3e390b8: Downloading route content (Github, zip)
- Pull request #922 at a3bc9e7: Autopilot for timetable mode
- Pull request #946 at 91a03af: Advanced track sounds
- Pull request #952 at 8347095: Investigation - Pulsing graphics
- Pull request #953 at a519452: Fix Lights Crash on Corrupt Shapes
- Pull request #954 at f837ffd: Add Support for Multiple Track Profiles
- Pull request #959 at 2452cb0: Fix TrackViewer crash on big zoom value
- Pull request #962 at 46d0472: Fix pantographs on unpowered cars
- Pull request #964 at b11c894: fix: Warning CA1417: Do not use the 'OutAttribute' for string parameter
- Pull request #965 at 7554f02: style: Renormalize line endings
- Pull request #966 at 6353e03: fix: Warning CS0618: 'string.Copy(string)' is obsolete
- Pull request #968 at 1ccdf71: Initial build of adding track section identifier for rack railway
- Pull request #969 at e7a10c5: Bugfix refocus to the main window when opening  the map window

Author: openrails-bot

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;