Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DataGridColumn - fix LayoutRoundedWidth with DPI scaling applied #6860

Merged
merged 3 commits into from
Dec 7, 2021
Merged

DataGridColumn - fix LayoutRoundedWidth with DPI scaling applied #6860

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
424ddb0
DataGridColumn - fix LayoutRoundedWidth with DPI scaling applied
Nov 4, 2021
937c5b3
Merge branch 'master' into datagrid_layoutrounding
maxkatz6 Nov 25, 2021
892afd2
Merge branch 'master' into datagrid_layoutrounding
maxkatz6 Dec 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/Avalonia.Controls.DataGrid/DataGridColumn.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
using System.Diagnostics;
using Avalonia.Controls.Templates;
using Avalonia.Controls.Utils;
using Avalonia.Layout;
using Avalonia.Markup.Xaml.MarkupExtensions;

namespace Avalonia.Controls
Expand Down Expand Up @@ -858,9 +859,9 @@ internal void ComputeLayoutRoundedWidth(double leftEdge)
{
if (OwningGrid != null && OwningGrid.UseLayoutRounding)
{
double roundedLeftEdge = Math.Floor(leftEdge + 0.5);
double roundedRightEdge = Math.Floor(leftEdge + ActualWidth + 0.5);
LayoutRoundedWidth = roundedRightEdge - roundedLeftEdge;
var scale = LayoutHelper.GetLayoutScale(HeaderCell);
var roundSize = LayoutHelper.RoundLayoutSize(new Size(leftEdge + ActualWidth, 1), scale, scale);
LayoutRoundedWidth = roundSize.Width - leftEdge;
}
else
{
Expand Down