Browse Source

Merge branch 'master' into arc-shape

pull/6133/head
Jumar Macato 5 years ago
committed by GitHub
parent
commit
0d71c60f3e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      src/Avalonia.Controls/Grid.cs
  2. 2
      src/Avalonia.Controls/SplitView.cs
  3. 1
      src/Avalonia.Visuals/Animation/CrossFade.cs
  4. 4
      src/Avalonia.Visuals/Rendering/SceneGraph/BitmapBlendModeNode.cs
  5. 2
      src/Skia/Avalonia.Skia/DrawingContextImpl.cs
  6. 3
      src/Skia/Avalonia.Skia/Gpu/ISkiaGpu.cs
  7. 2
      tests/Avalonia.Controls.UnitTests/TreeViewTests.cs

1
src/Avalonia.Controls/Grid.cs

@ -978,6 +978,7 @@ namespace Avalonia.Controls
/// width is not registered in columns.</param>
/// <param name="forceInfinityV">Passed through to MeasureCell.
/// When "true" cells' desired height is not registered in rows.</param>
/// <param name="hasDesiredSizeUChanged">return true when desired size has changed</param>
private void MeasureCellsGroup(
int cellsHead,
Size referenceSize,

2
src/Avalonia.Controls/SplitView.cs

@ -133,7 +133,7 @@ namespace Avalonia.Controls
AvaloniaProperty.Register<SplitView, object?>(nameof(Pane));
/// <summary>
/// Defines the <see cref="HeaderTemplate"/> property.
/// Defines the <see cref="PaneTemplate"/> property.
/// </summary>
public static readonly StyledProperty<IDataTemplate?> PaneTemplateProperty =
AvaloniaProperty.Register<HeaderedContentControl, IDataTemplate?>(nameof(PaneTemplate));

1
src/Avalonia.Visuals/Animation/CrossFade.cs

@ -147,6 +147,7 @@ namespace Avalonia.Animation
/// <param name="forward">
/// Unused for cross-fades.
/// </param>
/// <param name="cancellationToken">allowed cancel transition</param>
/// <returns>
/// A <see cref="Task"/> that tracks the progress of the animation.
/// </returns>

4
src/Avalonia.Visuals/Rendering/SceneGraph/BitmapBlendModeNode.cs

@ -19,7 +19,7 @@ namespace Avalonia.Rendering.SceneGraph
}
/// <summary>
/// Initializes a new instance of the <see cref="BitmapBlendNode"/> class that represents an
/// Initializes a new instance of the <see cref="BitmapBlendModeNode"/> class that represents an
/// <see cref="BitmapBlendingMode"/> pop.
/// </summary>
public BitmapBlendModeNode()
@ -40,7 +40,7 @@ namespace Avalonia.Rendering.SceneGraph
/// <summary>
/// Determines if this draw operation equals another.
/// </summary>
/// <param name="opacity">The opacity of the other draw operation.</param>
/// <param name="blendingMode">the <see cref="BitmapBlendModeNode"/> how to compare</param>
/// <returns>True if the draw operations are the same, otherwise false.</returns>
/// <remarks>
/// The properties of the other draw operation are passed in as arguments to prevent

2
src/Skia/Avalonia.Skia/DrawingContextImpl.cs

@ -591,7 +591,7 @@ namespace Avalonia.Skia
/// Configure paint wrapper for using gradient brush.
/// </summary>
/// <param name="paintWrapper">Paint wrapper.</param>
/// <param name="targetSize">Target size.</param>
/// <param name="targetRect">Target bound rect.</param>
/// <param name="gradientBrush">Gradient brush.</param>
private void ConfigureGradientBrush(ref PaintWrapper paintWrapper, Rect targetRect, IGradientBrush gradientBrush)
{

3
src/Skia/Avalonia.Skia/Gpu/ISkiaGpu.cs

@ -16,11 +16,12 @@ namespace Avalonia.Skia
/// <param name="surfaces">Surfaces.</param>
/// <returns>Created render target or <see langword="null"/> if it fails.</returns>
ISkiaGpuRenderTarget TryCreateRenderTarget(IEnumerable<object> surfaces);
/// <summary>
/// Creates an offscreen render target surface
/// </summary>
/// <param name="size">size in pixels</param>
/// <param name="session">current Skia render session</param>
ISkiaSurface TryCreateSurface(PixelSize size, ISkiaGpuRenderSession session);
}

2
tests/Avalonia.Controls.UnitTests/TreeViewTests.cs

@ -1066,7 +1066,7 @@ namespace Avalonia.Controls.UnitTests
[Fact]
public void Auto_Expanding_In_Style_Should_Not_Break_Range_Selection()
{
/// Issue #2980.
// Issue #2980.
using (Application())
{
var target = new DerivedTreeView

Loading…
Cancel
Save