Brought over changes from other branch for checking if the cursor is …

…in the game window and if the game window is active
vchelaru · Oct 30, 2024 · b885891 · b885891
1 parent 5bcf011
commit b885891
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/GumRuntime/InteractiveGue.cs b/GumRuntime/InteractiveGue.cs
@@ -685,6 +685,9 @@ public static void DoUiActivityRecursively(IList<GraphicalUiElement> gues, ICurs
             var windowOverBefore = cursor.WindowOver;
             var windowPushedBefore = cursor.WindowPushed;
 
+            var isInWindow = cursor.X >= 0 && cursor.X < GraphicalUiElement.CanvasWidth &&
+                cursor.Y >= 0 && cursor.Y < GraphicalUiElement.CanvasHeight;
+
             HandledActions actions = new HandledActions();
             cursor.WindowOver = null;
             for(int i = gues.Count-1; i > -1; i--)
@@ -731,13 +734,13 @@ public static void DoUiActivityRecursively(IList<GraphicalUiElement> gues, ICurs
             }
 
             // the click/push actions need to be after the UI activity
-            if (cursor.PrimaryClick)
+            if (cursor.PrimaryClick && isInWindow)
             {
                 InteractiveGue.DoNextClickActions();
 
             }
 
-            if (cursor.PrimaryPush)
+            if (cursor.PrimaryPush && isInWindow)
             {
                 InteractiveGue.DoNextPushActions();
             }

diff --git a/MonoGameGum/Forms/FormsUtilities.cs b/MonoGameGum/Forms/FormsUtilities.cs
@@ -76,8 +76,22 @@ static ContainerRuntime CreateFullscreenContainer()
 
         static List<GraphicalUiElement> innerList = new List<GraphicalUiElement>();
 
+        [Obsolete("Use the overload which takes a Game as the first argument, and pass the game instance.")]
         public static void Update(GameTime gameTime, GraphicalUiElement rootGue)
         {
+            Update(null, gameTime, rootGue);
+        }
+
+        public static void Update(Game game, GameTime gameTime, GraphicalUiElement rootGue)
+        {
+            // tolerate null games for now...
+            var shouldProcess = game == null || game.IsActive;
+
+            if(!shouldProcess)
+            {
+                return;
+            }
+
             cursor.Activity(gameTime.TotalGameTime.TotalSeconds);
             keyboard.Activity(gameTime.TotalGameTime.TotalSeconds);
             innerList.Clear();