diff --git a/windows/Controls/GaugeControl.cs b/windows/Controls/GaugeControl.cs index af180db..0b6a7af 100644 --- a/windows/Controls/GaugeControl.cs +++ b/windows/Controls/GaugeControl.cs @@ -46,29 +46,16 @@ public class GaugeControl : FrameworkElement DrawArc(dc, cx, cy, radius, StartAngleDeg, SweepDeg * (Percent / 100.0), new Pen(Accent, StrokeWidth)); - var dpi = VisualTreeHelper.GetDpi(this).PixelsPerDip; - + var dpi = VisualTreeHelper.GetDpi(this).PixelsPerDip; var textColor = ThemeManager.IsDark ? Color.FromRgb(0xF5, 0xF5, 0xF5) : Color.FromRgb(0x1C, 0x1C, 0x1C); - var subColor = Color.FromRgb(0x9E, 0x9E, 0x9E); var pctText = new FormattedText( $"{(int)Math.Round(Percent)}%", CultureInfo.CurrentCulture, FlowDirection.LeftToRight, new Typeface(new FontFamily("Segoe UI"), FontStyles.Normal, FontWeights.Bold, FontStretches.Normal), - 14, new SolidColorBrush(textColor), dpi); - var sub = new FormattedText( - "used", - CultureInfo.CurrentCulture, FlowDirection.LeftToRight, - new Typeface("Segoe UI"), 8, - new SolidColorBrush(subColor), dpi) - { - TextAlignment = TextAlignment.Center - }; + 18, new SolidColorBrush(textColor), dpi); - var totalHeight = pctText.Height + 2 + sub.Height; - var startY = cy - totalHeight / 2; - dc.DrawText(pctText, new Point(cx - pctText.Width / 2, startY)); - dc.DrawText(sub, new Point(cx - sub.Width / 2, startY + pctText.Height + 2)); + dc.DrawText(pctText, new Point(cx - pctText.Width / 2, cy - pctText.Height / 2)); } private static void DrawArc(DrawingContext dc, double cx, double cy, double r,