diff --git a/SunnyUI/Controls/UIAnalogMeterRender.cs b/SunnyUI/Controls/UIAnalogMeterRender.cs index 40552097..872ea671 100644 --- a/SunnyUI/Controls/UIAnalogMeterRender.cs +++ b/SunnyUI/Controls/UIAnalogMeterRender.cs @@ -243,7 +243,7 @@ namespace Sunny.UI Gr.DrawLine(pen, ptStart, ptEnd); //Draw Strings - Font font = new Font(this.AnalogMeter.Font.FontFamily, (float)(6F * drawRatio)); + using Font font = new Font(this.AnalogMeter.Font.FontFamily, (float)(6F * drawRatio)); float tx = (float)(cx + (radius - (20 * drawRatio)) * Math.Cos(currentAngle)); float ty = (float)(cy + (radius - (20 * drawRatio)) * Math.Sin(currentAngle)); diff --git a/SunnyUI/Controls/UIKnobControl.cs b/SunnyUI/Controls/UIKnobControl.cs index 1b73a89f..89b92806 100644 --- a/SunnyUI/Controls/UIKnobControl.cs +++ b/SunnyUI/Controls/UIKnobControl.cs @@ -560,6 +560,7 @@ namespace Sunny.UI brushKnobPointer.Dispose(); gOffScreen?.Dispose(); OffScreenImage?.Dispose(); + _scaleFont?.Dispose(); } public UIKnob() @@ -1057,8 +1058,6 @@ namespace Sunny.UI /// private void SetDimensions() { - Font font; - // Rectangle float x, y, w, h; x = 0; @@ -1082,7 +1081,7 @@ namespace Sunny.UI String str = String.Format("{0,0:D}", (int)val); float fSize = _scaleFont.Size; - + Font font; if (_scaleFontAutoSize) { fSize = (float)(6F * drawRatio); @@ -1097,6 +1096,7 @@ namespace Sunny.UI } SizeF strsize = TextRenderer.MeasureText(str, font); + font.Dispose(); // Graduations outside gradLength = 4 * drawRatio;