ChangeClientBounds (#1588)

* call ChangeClientBounds() * update TouchPanel only when _clientBounds changed
kniEngine · May 21, 2024 · 3775024 · 3775024
1 parent 28462ff
commit 3775024
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/MonoGame.Framework/Platform/Android/AndroidGameWindow.cs b/MonoGame.Framework/Platform/Android/AndroidGameWindow.cs
@@ -244,11 +244,12 @@ internal void ChangeClientBounds(Rectangle bounds)
             {
                 _clientBounds = bounds;
                 OnClientSizeChanged();
+
+                Android.Util.Log.Debug("Kni", "GameWindow.ChangeClientBounds: newClientBounds=" + this.ClientBounds.Width + "," + this.ClientBounds.Height);
+                TouchPanel.DisplayWidth = this.ClientBounds.Width;
+                TouchPanel.DisplayHeight = this.ClientBounds.Height;
             }
 
-            Android.Util.Log.Debug("Kni", "GameWindow.ChangeClientBounds: newClientBounds=" + this.ClientBounds.Width + "," + this.ClientBounds.Height);
-            TouchPanel.DisplayWidth = this.ClientBounds.Width;
-            TouchPanel.DisplayHeight = this.ClientBounds.Height;
         }
 
         public override bool AllowUserResizing

diff --git a/MonoGame.Framework/Platform/Android/AndroidSurfaceView.cs b/MonoGame.Framework/Platform/Android/AndroidSurfaceView.cs
@@ -289,10 +289,9 @@ void ProcessStateResumed()
                             {
                                 ConcreteGraphicsDevice gd = (ConcreteGraphicsDevice)((IPlatformGraphicsDevice)gdm.GraphicsDevice).Strategy;
                                 gd.Android_UpdateBackBufferBounds(this.Width, this.Height);
-
-                                _gameWindow.ChangeClientBounds(new Rectangle(0, 0, this.Width, this.Height));
                             }
                         }
+                        _gameWindow.ChangeClientBounds(new Rectangle(0, 0, this.Width, this.Height));
                     }
 
                     if (_isGLContextLost)
@@ -322,9 +321,9 @@ void ProcessStateResumed()
                             ConcreteGraphicsDevice gd = (ConcreteGraphicsDevice)((IPlatformGraphicsDevice)gdm.GraphicsDevice).Strategy;
                             gd.Android_UpdateBackBufferBounds(this.Width, this.Height);
 
-                            _gameWindow.ChangeClientBounds(new Rectangle(0, 0, this.Width, this.Height));
                         }
                     }
+                    _gameWindow.ChangeClientBounds(new Rectangle(0, 0, this.Width, this.Height));
                 }
 
                 // check if app wants to exit

diff --git a/MonoGame.Framework/Platform/Cardboard/AndroidGameWindow.cs b/MonoGame.Framework/Platform/Cardboard/AndroidGameWindow.cs
@@ -244,11 +244,11 @@ internal void ChangeClientBounds(Rectangle bounds)
             {
                 _clientBounds = bounds;
                 OnClientSizeChanged();
-            }
 
-            Android.Util.Log.Debug("Kni", "GameWindow.ChangeClientBounds: newClientBounds=" + this.ClientBounds.Width + "," + this.ClientBounds.Height);
-            TouchPanel.DisplayWidth = this.ClientBounds.Width;
-            TouchPanel.DisplayHeight = this.ClientBounds.Height;
+                Android.Util.Log.Debug("Kni", "GameWindow.ChangeClientBounds: newClientBounds=" + this.ClientBounds.Width + "," + this.ClientBounds.Height);
+                TouchPanel.DisplayWidth = this.ClientBounds.Width;
+                TouchPanel.DisplayHeight = this.ClientBounds.Height;
+            }
         }
 
         public override bool AllowUserResizing

diff --git a/MonoGame.Framework/Platform/Cardboard/AndroidSurfaceView.cs b/MonoGame.Framework/Platform/Cardboard/AndroidSurfaceView.cs
@@ -238,10 +238,9 @@ void ProcessStateResumed()
                             {
                                 ConcreteGraphicsDevice gd = (ConcreteGraphicsDevice)((IPlatformGraphicsDevice)gdm.GraphicsDevice).Strategy;
                                 gd.Android_UpdateBackBufferBounds(this.Width, this.Height);
-
-                                _gameWindow.ChangeClientBounds(new Rectangle(0, 0, this.Width, this.Height));
                             }
                         }
+                        _gameWindow.ChangeClientBounds(new Rectangle(0, 0, this.Width, this.Height));
                     }
 
                     if (_isGLContextLost)
@@ -275,9 +274,9 @@ void ProcessStateResumed()
                             ConcreteGraphicsDevice gd = (ConcreteGraphicsDevice)((IPlatformGraphicsDevice)gdm.GraphicsDevice).Strategy;
                             gd.Android_UpdateBackBufferBounds(this.Width, this.Height);
 
-                            _gameWindow.ChangeClientBounds(new Rectangle(0, 0, this.Width, this.Height));
                         }
                     }
+                    _gameWindow.ChangeClientBounds(new Rectangle(0, 0, this.Width, this.Height));
                 }
 
                 // check if app wants to exit