tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix Grid dpi and roundedlayout stuff + add GridLinesRenderer as Grid's visual child.

pull/2563/head
Jumar Macato 7 years ago
parent
4fbd443386
commit
4c0f365118
No known key found for this signature in database GPG Key ID: B19884DAC3A5BF3F
1 changed files with 14 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      src/Avalonia.Controls/Grid.cs

26
src/Avalonia.Controls/Grid.cs
View File

@ -1999,8 +1999,9 @@ namespace Avalonia.Controls
if (useLayoutRounding) if (useLayoutRounding)
{ {
DpiScale dpiScale = GetDpi(); // DpiScale dpiScale = GetDpi();
dpi = columns ? dpiScale.DpiScaleX : dpiScale.DpiScaleY; // dpi = columns ? dpiScale.DpiScaleX : dpiScale.DpiScaleY;
dpi = (VisualRoot as Layout.ILayoutRoot)?.LayoutScaling ?? 1.0;
roundingErrors = RoundingErrors; roundingErrors = RoundingErrors;
} }
@ -2033,7 +2034,7 @@ namespace Avalonia.Controls
if (useLayoutRounding) if (useLayoutRounding)
{ {
roundingErrors[i] = definitions[i].SizeCache; roundingErrors[i] = definitions[i].SizeCache;
definitions[i].SizeCache = Control.RoundLayoutValue(definitions[i].SizeCache, dpi); definitions[i].SizeCache = MathUtilities.RoundLayoutValue(definitions[i].SizeCache, dpi);
} }
} }
definitionIndices[starDefinitionsCount++] = i; definitionIndices[starDefinitionsCount++] = i;
@ -2072,7 +2073,7 @@ namespace Avalonia.Controls
if (useLayoutRounding) if (useLayoutRounding)
{ {
roundingErrors[i] = definitions[i].SizeCache; roundingErrors[i] = definitions[i].SizeCache;
definitions[i].SizeCache = Control.RoundLayoutValue(definitions[i].SizeCache, dpi); definitions[i].SizeCache = MathUtilities.RoundLayoutValue(definitions[i].SizeCache, dpi);
} }
allPreferredArrangeSize += definitions[i].SizeCache; allPreferredArrangeSize += definitions[i].SizeCache;
@ -2123,7 +2124,7 @@ namespace Avalonia.Controls
if (useLayoutRounding) if (useLayoutRounding)
{ {
roundingErrors[definitionIndices[i]] = definitions[definitionIndices[i]].SizeCache; roundingErrors[definitionIndices[i]] = definitions[definitionIndices[i]].SizeCache;
definitions[definitionIndices[i]].SizeCache = Control.RoundLayoutValue(definitions[definitionIndices[i]].SizeCache, dpi); definitions[definitionIndices[i]].SizeCache = MathUtilities.RoundLayoutValue(definitions[definitionIndices[i]].SizeCache, dpi);
} }
allPreferredArrangeSize += definitions[definitionIndices[i]].SizeCache; allPreferredArrangeSize += definitions[definitionIndices[i]].SizeCache;
@ -2148,7 +2149,7 @@ namespace Avalonia.Controls
if (useLayoutRounding) if (useLayoutRounding)
{ {
roundingErrors[definitionIndex] = final; roundingErrors[definitionIndex] = final;
final = Control.RoundLayoutValue(finalOld, dpi); final = MathUtilities.RoundLayoutValue(finalOld, dpi);
final = Math.Max(final, definitions[definitionIndex].MinSizeForArrange); final = Math.Max(final, definitions[definitionIndex].MinSizeForArrange);
final = Math.Min(final, definitions[definitionIndex].SizeCache); final = Math.Min(final, definitions[definitionIndex].SizeCache);
} }
@ -2175,7 +2176,7 @@ namespace Avalonia.Controls
RoundingErrorIndexComparer roundingErrorIndexComparer = new RoundingErrorIndexComparer(roundingErrors); RoundingErrorIndexComparer roundingErrorIndexComparer = new RoundingErrorIndexComparer(roundingErrors);
Array.Sort(definitionIndices, 0, definitions.Count, roundingErrorIndexComparer); Array.Sort(definitionIndices, 0, definitions.Count, roundingErrorIndexComparer);
double adjustedSize = allPreferredArrangeSize; double adjustedSize = allPreferredArrangeSize;
double dpiIncrement = Control.RoundLayoutValue(1.0, dpi); double dpiIncrement = MathUtilities.RoundLayoutValue(1.0, dpi);
if (allPreferredArrangeSize > finalSize) if (allPreferredArrangeSize > finalSize)
{ {
@ -2565,8 +2566,9 @@ namespace Avalonia.Controls
// unrounded sizes, to avoid breaking assumptions in the previous phases // unrounded sizes, to avoid breaking assumptions in the previous phases
if (UseLayoutRounding) if (UseLayoutRounding)
{ {
DpiScale dpiScale = GetDpi(); // DpiScale dpiScale = GetDpi();
double dpi = columns ? dpiScale.DpiScaleX : dpiScale.DpiScaleY; // double dpi = columns ? dpiScale.DpiScaleX : dpiScale.DpiScaleY;
var dpi = (VisualRoot as Layout.ILayoutRoot)?.LayoutScaling ?? 1.0;
double[] roundingErrors = RoundingErrors; double[] roundingErrors = RoundingErrors;
double roundedTakenSize = 0.0; double roundedTakenSize = 0.0;
@ -2574,7 +2576,7 @@ namespace Avalonia.Controls
for (int i = 0; i < definitions.Count; ++i) for (int i = 0; i < definitions.Count; ++i)
{ {
DefinitionBase def = definitions[i]; DefinitionBase def = definitions[i];
double roundedSize = Control.RoundLayoutValue(def.SizeCache, dpi); double roundedSize = MathUtilities.RoundLayoutValue(def.SizeCache, dpi);
roundingErrors[i] = (roundedSize - def.SizeCache); roundingErrors[i] = (roundedSize - def.SizeCache);
def.SizeCache = roundedSize; def.SizeCache = roundedSize;
roundedTakenSize += roundedSize; roundedTakenSize += roundedSize;
@ -2823,12 +2825,12 @@ namespace Avalonia.Controls
if (ShowGridLines && (_gridLinesRenderer == null)) if (ShowGridLines && (_gridLinesRenderer == null))
{ {
_gridLinesRenderer = new GridLinesRenderer(); _gridLinesRenderer = new GridLinesRenderer();
this.AddVisualChild(_gridLinesRenderer); this.VisualChildren.Add(_gridLinesRenderer);
} }
if ((!ShowGridLines) && (_gridLinesRenderer != null)) if ((!ShowGridLines) && (_gridLinesRenderer != null))
{ {
this.RemoveVisualChild(_gridLinesRenderer); this.VisualChildren.Add(_gridLinesRenderer);
_gridLinesRenderer = null; _gridLinesRenderer = null;
} }

Write Preview
Loading…
Cancel
Save