Revert "Gradient Memory Leak, Transformations and Clipping"

Author: michel-pi

source/GameOverlay/Drawing/Graphics.cs

@@ -350,37 +350,6 @@ public SolidBrush CreateSolidBrush(Color color)
 			return new SolidBrush(_device, color);
 		}
 
-		/// <summary>
-		/// Specifies a rectangle to which all subsequent drawing operations are clipped.
-		/// </summary>
-		/// <param name="left">The x-coordinate of the upper-left corner of the rectangle.</param>
-		/// <param name="top">The y-coordinate of the upper-left corner of the rectangle.</param>
-		/// <param name="right">The x-coordinate of the lower-right corner of the rectangle.</param>
-		/// <param name="bottom">The y-coordinate of the lower-right corner of the rectangle.</param>
-		public void ClipRegionStart(float left, float top, float right, float bottom)
-		{
-			if (!IsDrawing) ThrowHelper.UseBeginScene();
-
-			_device.PushAxisAlignedClip(new RawRectangleF(left, top, right, bottom), PerPrimitiveAntiAliasing ? AntialiasMode.PerPrimitive : AntialiasMode.Aliased);
-		}
-
-		/// <summary>
-		/// Specifies a rectangle to which all subsequent drawing operations are clipped.
-		/// </summary>
-		/// <param name="region">A Rectangle representing the size and position of the clipping area.</param>
-		public void ClipRegionStart(Rectangle region)
-			=> ClipRegionStart(region.Left, region.Top, region.Right, region.Bottom);
-
-		/// <summary>
-		/// Removes the last clip from the render target. After this method is called, the clip is no longer applied to subsequent drawing operations.
-		/// </summary>
-		public void ClipRegionEnd()
-		{
-			if (!IsDrawing) ThrowHelper.UseBeginScene();
-
-			_device.PopAxisAlignedClip();
-		}
-
 		/// <summary>
 		/// Draws a circle with a dashed line by using the given brush and dimension.
 		/// </summary>
@@ -1255,43 +1224,6 @@ public void DrawTextWithBackground(Font font, float fontSize, IBrush brush, IBru
 			layout.Dispose();
 		}
 
-		/// <summary>
-		/// Measures the specified string when drawn with the specified Font.
-		/// </summary>
-		/// <param name="font">Font that defines the text format of the string.</param>
-		/// <param name="fontSize">The size of the Font. (does not need to be the same as in Font.FontSize)</param>
-		/// <param name="text">String to measure.</param>
-		/// <returns>This method returns a Point containing the width (x) and height (y) of the given text.</returns>
-		public Point MeasureString(Font font, float fontSize, string text)
-		{
-			if (!IsDrawing) throw ThrowHelper.UseBeginScene();
-
-			if (text == null) throw new ArgumentNullException(nameof(text));
-			if (text.Length == 0) return default;
-
-			var layout = new TextLayout(_fontFactory, text, font.TextFormat, Width, Height);
-
-			if (fontSize != font.FontSize)
-			{
-				layout.SetFontSize(fontSize, new TextRange(0, text.Length));
-			}
-
-			var result = new Point(layout.Metrics.Width, layout.Metrics.Height);
-
-			layout.Dispose();
-
-			return result;
-		}
-
-		/// <summary>
-		/// Measures the specified string when drawn with the specified Font.
-		/// </summary>
-		/// <param name="font">Font that defines the text format of the string.</param>
-		/// <param name="text">String to measure.</param>
-		/// <returns>This method returns a Point containing the width (x) and height (y) of the given text.</returns>
-		public Point MeasureString(Font font, string text)
-			=> MeasureString(font, font.FontSize, text);
-
 		/// <summary>
 		/// Draws a string with a background box in behind using the given font, size and position.
 		/// </summary>

source/GameOverlay/Drawing/LinearGradientBrush.cs

@@ -13,7 +13,6 @@ namespace GameOverlay.Drawing
     public class LinearGradientBrush : IDisposable, IBrush
     {
         private SharpDXGradientBrush _brush;
-        private GradientStopCollection _stopCollection;
 
         /// <summary>
         /// Gets or sets the underlying Brush.
@@ -60,11 +59,9 @@ public LinearGradientBrush(RenderTarget device, params Color[] colors)
                 position += stepSize;
             }
 
-            _stopCollection = new GradientStopCollection(device, gradientStops, ExtendMode.Clamp);
-
             Brush = new SharpDXGradientBrush(device,
                 new LinearGradientBrushProperties(),
-                _stopCollection);
+                new GradientStopCollection(device, gradientStops, ExtendMode.Clamp));
         }
 
         /// <summary>
@@ -157,7 +154,7 @@ public override string ToString()
         }
 
         #region IDisposable Support
-        private bool disposedValue;
+        private bool disposedValue = false;
 
         /// <summary>
         /// Releases all resources used by this LinearGradientBrush.
@@ -167,11 +164,9 @@ protected virtual void Dispose(bool disposing)
         {
             if (!disposedValue)
             {
-                _brush?.Dispose();
-                _stopCollection?.Dispose();
-
-                _brush = null;
-                _stopCollection = null;
+                if (disposing)
+                {
+                }
 
                 disposedValue = true;
             }