fix aspect ratio positioning #2557

Author: lodicolo

Intersect.Client.Core/Interface/Game/EventWindow.cs

@@ -89,6 +89,7 @@ private EventWindow(Canvas gameCanvas, Dialog dialog) : base(gameCanvas, nameof(
             MaintainAspectRatio = true,
             Margin = new Margin(8, 8, 0, 8),
             MaximumSize = new Point(128, 128),
+            RestrictToParent = true,
         };
 
         _promptScroller = new ScrollControl(_promptPanel, nameof(_promptScroller))

Intersect.Client.Framework/Gwen/Control/ImagePanel.cs

@@ -160,6 +160,11 @@ protected override void OnMouseClicked(MouseButton mouseButton, Point mousePosit
         );
     }
 
+    protected override void OnPositionChanged(Point oldPosition, Point newPosition)
+    {
+        base.OnPositionChanged(oldPosition, newPosition);
+    }
+
     /// <summary>
     ///     Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
     /// </summary>
@@ -404,34 +409,42 @@ public override bool SizeToChildren(bool resizeX = true, bool resizeY = true, bo
 
     public override bool SetBounds(int x, int y, int width, int height)
     {
+        var updatedX = x;
+        var updatedY = y;
+        var updatedWidth = width;
+        var updatedHeight = height;
         if (MaintainAspectRatio)
         {
             var bounds = Bounds;
             var aspectRatio = _textureAspectRatio;
-            if (width == bounds.Width)
+            if (updatedWidth == bounds.Width)
             {
-                if (height != bounds.Height)
+                if (updatedHeight != bounds.Height)
                 {
-                    var aspectRatioWidth = (int)(height * aspectRatio);
-                    if (aspectRatioWidth > width)
+                    var aspectRatioWidth = (int)(updatedHeight * aspectRatio);
+                    if (aspectRatioWidth > updatedWidth)
                     {
-                        var deltaWidth = width - aspectRatioWidth;
-                        x += deltaWidth / 2;
-                        width = aspectRatioWidth;
+                        var deltaWidth = updatedWidth - aspectRatioWidth;
+                        updatedX += deltaWidth / 2;
+                        updatedWidth = aspectRatioWidth;
+                        if (RestrictToParent)
+                        {
+                            updatedX = Math.Max(0, updatedX);
+                        }
                     }
                 }
             }
-            else if (height == bounds.Height)
+            else if (updatedHeight == bounds.Height)
             {
-                var aspectRatioHeight = (int)(width / aspectRatio);
-                if (aspectRatioHeight > height)
+                var aspectRatioHeight = (int)(updatedWidth / aspectRatio);
+                if (aspectRatioHeight > updatedHeight)
                 {
-                    height = aspectRatioHeight;
+                    updatedHeight = aspectRatioHeight;
                 }
             }
         }
 
-        return base.SetBounds(x, y, width, height);
+        return base.SetBounds(updatedX, updatedY, updatedWidth, updatedHeight);
     }
 
     public override Point GetChildrenSize()