diff --git a/src/client/spark/view/Controls/DIYGrid/CellRender/TextCell.cs b/src/client/spark/view/Controls/DIYGrid/CellRender/TextCell.cs index 834916025..3ee3c56ee 100644 --- a/src/client/spark/view/Controls/DIYGrid/CellRender/TextCell.cs +++ b/src/client/spark/view/Controls/DIYGrid/CellRender/TextCell.cs @@ -1,5 +1,5 @@ -using mbts.ui.utility.text; -using System; +using mbts.ui.dpi; +using mbts.ui.utility.text; using System.Linq; using System.Windows; using System.Windows.Controls; @@ -15,6 +15,7 @@ namespace mbts.ui.controls { Brush _background, _foreground, _border_brush_backing; double _glyph_width => _gcr.glyph_run.AdvanceWidths.Sum(); GlyphRun _glyph_run => _gcr.glyph_run; + bool _snaps_to_device_pixels; Pen _border_stroke_pen_backing; GlyphContentRect _gcr = new GlyphContentRect(); @@ -26,7 +27,7 @@ namespace mbts.ui.controls { } } Thickness _border_thickness { - get => _gcr.border_thickness; + get => _snaps_to_device_pixels ? _gcr.border_thickness.RoundToLayout() : _gcr.border_thickness; set { _gcr.border_thickness = new Thickness(value.Left); _border_stroke_pen_backing = null; @@ -52,6 +53,11 @@ namespace mbts.ui.controls { FrameworkPropertyMetadataOptions.AffectsRender, (o, v) => o._gcr.width = v, double.NaN); + WPFHelper.override_metadata( + SnapsToDevicePixelsProperty, + FrameworkPropertyMetadataOptions.AffectsRender, + (o, v) => o._snaps_to_device_pixels = v, + true); } public TextCell() { @@ -60,7 +66,7 @@ namespace mbts.ui.controls { _gcr.max_width = MaxWidth; _gcr.min_height = MinHeight; _gcr.height = Height; - _gcr.max_height = Height; + _gcr.max_height = MaxHeight; _gcr.padding = Padding; _gcr.border_thickness = BorderThickness; _gcr.horizontal_alignment = HorizontalAlignment; @@ -74,6 +80,7 @@ namespace mbts.ui.controls { if (Text is string str && !string.IsNullOrEmpty(str)) _gcr.text_lines = new[] { str }; _gcr.glyph_context = GlyphContext.create(FontFamily, FontWeight); + _snaps_to_device_pixels = SnapsToDevicePixels; } #region BorderThickness @@ -111,14 +118,7 @@ namespace mbts.ui.controls { new FrameworkPropertyMetadata( HorizontalAlignment.Center, FrameworkPropertyMetadataOptions.AffectsArrange, - (d, e) => { - if (e.OldValue is HorizontalAlignment oldha) { - if (oldha == HorizontalAlignment.Right) { - - } - } - ((TextCell)d)._gcr.horizontal_content_alignment = (HorizontalAlignment)e.NewValue; - })); + (d, e) => ((TextCell)d)._gcr.horizontal_content_alignment = (HorizontalAlignment)e.NewValue)); public HorizontalAlignment HorizontalContentAlignment { get => (HorizontalAlignment)GetValue(HorizontalContentAlignmentProperty); @@ -130,7 +130,8 @@ namespace mbts.ui.controls { public static readonly DependencyProperty VerticalContentAlignmentProperty = Control.VerticalContentAlignmentProperty.AddOwner(typeof(TextCell), new FrameworkPropertyMetadata( VerticalAlignment.Center, - FrameworkPropertyMetadataOptions.AffectsArrange, + FrameworkPropertyMetadataOptions.AffectsArrange | + FrameworkPropertyMetadataOptions.AffectsRender, (d, e) => ((TextCell)d)._gcr.vertical_content_alignment = (VerticalAlignment)e.NewValue)); public VerticalAlignment VerticalContentAlignment { @@ -210,8 +211,7 @@ namespace mbts.ui.controls { nameof(Padding), FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender, - (p, v) => p._gcr.padding = v, - DIYGrid.DefaultCellPadding); + (p, v) => p._gcr.padding = default, default); public Thickness Padding { get => (Thickness)GetValue(PaddingProperty); set => SetValue(PaddingProperty, value); } #endregion @@ -237,35 +237,17 @@ namespace mbts.ui.controls { return _gcr.layout_size; } - double bl_x = 0; protected override void OnRender(DrawingContext drawingContext) { var rs = RenderSize; var rect = new Rect(0, 0, rs.Width, rs.Height); var bg = Background; - if (bg != null) { - drawingContext.DrawRectangle(bg, _border_stroke_pen, rect); - } - if (_glyph_run != null) { - var new_x = _glyph_run.BaselineOrigin.X; - if (Math.Abs(bl_x - new_x) > 5) { - - if (new_x < bl_x) { - - } - } - if (Text == "-3,375.000") { - - } - bl_x = new_x; + drawingContext.DrawRectangle(bg, _border_stroke_pen, rect, _snaps_to_device_pixels); + var gr = _glyph_run; + if (gr != null) { drawingContext.PushClip(new RectangleGeometry(rect)); - drawingContext.DrawGlyphRun(_foreground, _glyph_run); + drawingContext.DrawGlyphRun(_foreground, gr); drawingContext.Pop(); } - if (bg != null) { - var bgo = DIYGrid.GetBackgroundOverlay(this); - if (bgo != null) - drawingContext.DrawRectangle(bgo, null, rect); - } } } -} \ No newline at end of file +}