Fixes #401

rds1983 · Oct 23, 2023 · e510985 · e510985
1 parent 647f0f7
commit e510985
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 23 deletions.
diff --git a/src/Myra/Graphics2D/RenderContext.cs b/src/Myra/Graphics2D/RenderContext.cs
@@ -3,6 +3,7 @@
 using Myra.Utility;
 using FontStashSharp.RichText;
 using FontStashSharp.Interfaces;
+using info.lundin.math;
 
 #if MONOGAME || FNA
 using Microsoft.Xna.Framework;
@@ -76,6 +77,35 @@ static RenderContext()
 		private TextureFiltering _textureFiltering = TextureFiltering.Nearest;
 		public Transform Transform;
 
+		internal Rectangle DeviceScissor
+		{
+			get
+			{
+#if MONOGAME || FNA
+				var device = _renderer.GraphicsDevice;
+				return device.ScissorRectangle;
+#elif STRIDE
+				return MyraEnvironment.Game.GraphicsContext.CommandList.Scissor;
+#else
+				return _renderer.Scissor;
+#endif
+			}
+
+			set
+			{
+#if MONOGAME || FNA
+				var device = _renderer.GraphicsDevice;
+				device.ScissorRectangle = value;
+#elif STRIDE
+				Flush();
+				MyraEnvironment.Game.GraphicsContext.CommandList.SetScissorRectangle(value);
+#else
+				_renderer.Scissor = value;
+#endif
+			}
+		}
+
+
 		public Rectangle Scissor
 		{
 			get
@@ -97,13 +127,12 @@ public Rectangle Scissor
 				var device = _renderer.GraphicsDevice;
 				value.X += device.Viewport.X;
 				value.Y += device.Viewport.Y;
-				device.ScissorRectangle = value;
 #elif STRIDE
 				Flush();
-				MyraEnvironment.Game.GraphicsContext.CommandList.SetScissorRectangle(value);
 #else
-				_renderer.Scissor = value;
 #endif
+
+				DeviceScissor = value;
 			}
 		}
 
@@ -127,7 +156,6 @@ public RenderContext()
 				_fontStashRenderer2 = new FontStashRenderer2(_renderer);
 			}
 #endif
-			_scissor = GetDeviceScissor();
 		}
 
 		/// <summary>
@@ -139,23 +167,6 @@ public void AddOpacity(float opacity)
 			Opacity *= opacity;
 		}
 
-		private Rectangle GetDeviceScissor()
-		{
-#if MONOGAME || FNA
-			var device = _renderer.GraphicsDevice;
-			var rect = device.ScissorRectangle;
-
-			rect.X -= device.Viewport.X;
-			rect.Y -= device.Viewport.Y;
-
-			return rect;
-#elif STRIDE
-			return MyraEnvironment.Game.GraphicsContext.CommandList.Scissor;
-#else
-			return _renderer.Scissor;
-#endif
-		}
-
 		private void SetTextureFiltering(TextureFiltering value)
 		{
 			if (_textureFiltering == value)

diff --git a/src/Myra/Graphics2D/UI/Desktop.cs b/src/Myra/Graphics2D/UI/Desktop.cs
@@ -706,7 +706,7 @@ private void WidgetsOnCollectionChanged(object sender, NotifyCollectionChangedEv
 
 		public void RenderVisual()
 		{
-			var oldScissorRectangle = _renderContext.Scissor;
+			var oldDeviceScissor = _renderContext.DeviceScissor;
 
 			_renderContext.Begin();
 
@@ -732,7 +732,7 @@ public void RenderVisual()
 
 			_renderContext.End();
 
-			_renderContext.Scissor = oldScissorRectangle;
+			_renderContext.DeviceScissor = oldDeviceScissor;
 		}
 
 		public void Render()