Merge pull request #969 from sweiland-openrails/mapSettingsSavedBugfix

Bugfix refocus to the main window when opening  the map window

Author: sweiland-openrails

Source/RunActivity/Viewer3D/Map/MapForm.cs

@@ -364,7 +364,11 @@ private void InitializeData()
             var maxsize = maxX - minX > maxY - minY ? maxX - minX : maxY - minY;
             // Take up to next 500
             maxsize = (int)((maxsize / 100) + 1) * 500;
-            mapResolutionUpDown.Maximum = (decimal)maxsize;
+            if ((decimal)maxsize < mapResolutionUpDown.Maximum)
+            {
+                // do not make maximum larger then the maximum defined in the Designer
+                mapResolutionUpDown.Maximum = (decimal)maxsize;
+            }
             Inited = true;
 
             if (simulator.TDB == null || simulator.TDB.TrackDB == null || simulator.TDB.TrackDB.TrItemTable == null)
@@ -1345,7 +1349,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 +1366,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 = gameX0 + GameForm.Size.Width;
+            int gameY1 = gameY0 + 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;