Browse Source
Merge branch 'master' into fix-navigation-direction
pull/3996/head
Dariusz Komosiński
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
12 additions and
6 deletions
-
src/Avalonia.Controls/Primitives/AdornerLayer.cs
-
src/Markup/Avalonia.Markup.Xaml/XamlIl/xamlil.github
|
|
|
@ -3,6 +3,7 @@ using System.Collections.Specialized; |
|
|
|
using System.Linq; |
|
|
|
using Avalonia.Media; |
|
|
|
using Avalonia.Rendering; |
|
|
|
using Avalonia.Utilities; |
|
|
|
using Avalonia.VisualTree; |
|
|
|
|
|
|
|
namespace Avalonia.Controls.Primitives |
|
|
|
@ -78,15 +79,20 @@ namespace Avalonia.Controls.Primitives |
|
|
|
|
|
|
|
private void UpdateClip(IControl control, TransformedBounds bounds) |
|
|
|
{ |
|
|
|
var clip = control.Clip as RectangleGeometry; |
|
|
|
|
|
|
|
if (clip == null) |
|
|
|
if (!(control.Clip is RectangleGeometry clip)) |
|
|
|
{ |
|
|
|
clip = new RectangleGeometry { Transform = new MatrixTransform() }; |
|
|
|
clip = new RectangleGeometry(); |
|
|
|
control.Clip = clip; |
|
|
|
} |
|
|
|
|
|
|
|
clip.Rect = bounds.Bounds; |
|
|
|
var clipBounds = bounds.Bounds; |
|
|
|
|
|
|
|
if (bounds.Transform.HasInverse) |
|
|
|
{ |
|
|
|
clipBounds = bounds.Clip.TransformToAABB(bounds.Transform.Invert()); |
|
|
|
} |
|
|
|
|
|
|
|
clip.Rect = clipBounds; |
|
|
|
} |
|
|
|
|
|
|
|
private void ChildrenCollectionChanged(object sender, NotifyCollectionChangedEventArgs e) |
|
|
|
|
|
|
|
@ -1 +1 @@ |
|
|
|
Subproject commit 4c4b6cf8ff0894c925d87b27d4fc7a064440c218 |
|
|
|
Subproject commit 068162245473ec39ee36da12150e928072b96403 |