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

[Windows] Optimize WrapperView #24281

Merged
merged 5 commits into from
Aug 20, 2024
Merged

[Windows] Optimize WrapperView #24281

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
351c847
Optimize WrapperView
MartyIX Aug 16, 2024
e5c5fe8
CS
MartyIX Aug 18, 2024
65ddf79
Bugfix
MartyIX Aug 18, 2024
674ec0d
Bugfix (2)
MartyIX Aug 18, 2024
be1ecb2
Remove SuppressFinalize
MartyIX Aug 18, 2024
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
89 changes: 66 additions & 23 deletions src/Core/src/Platform/Windows/WrapperView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,17 @@ namespace Microsoft.Maui.Platform
{
public partial class WrapperView : Grid, IDisposable
{
readonly Canvas _shadowCanvas;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: It was readonly but then _shadowCanvas was checked if it is null or not.

Canvas? _shadowCanvas;
SpriteVisual? _shadowVisual;
DropShadow? _dropShadow;
UI.Xaml.Shapes.Rectangle? _shadowHost;
Rectangle? _shadowHost;
WSize _shadowHostSize;
Path? _borderPath;

FrameworkElement? _child;

public WrapperView()
{
_shadowCanvas = new Canvas();
_borderPath = new Path();

Children.Add(_shadowCanvas);
Children.Add(_borderPath);
MartyIX marked this conversation as resolved.
Show resolved Hide resolved
}

long _visibilityDependencyPropertyCallbackToken;
Expand All @@ -44,15 +39,17 @@ public FrameworkElement? Child
get { return _child; }
internal set
{
if (_child != null)
if (_child is not null)
{
_child.SizeChanged -= OnChildSizeChanged;
_child.UnregisterPropertyChangedCallback(VisibilityProperty, _visibilityDependencyPropertyCallbackToken);
Children.Remove(_child);
}

if (value == null)
if (value is null)
{
return;
}

_child = value;
_child.SizeChanged += OnChildSizeChanged;
Expand All @@ -76,19 +73,25 @@ public void Dispose()

void UpdateClip()
{
if (Child == null)
if (Child is null)
{
return;
}

var clipGeometry = Clip;

if (clipGeometry == null)
if (clipGeometry is null)
{
return;
}

double width = Child.ActualWidth;
double height = Child.ActualHeight;

if (height <= 0 && width <= 0)
{
return;
}

var visual = ElementCompositionPreview.GetElementVisual(Child);
var compositor = visual.Compositor;
Expand Down Expand Up @@ -118,27 +121,41 @@ void DisposeBorder()

void UpdateBorder()
{
if (Border == null)
if (Border is null)
{
return;
}

if (_borderPath is null)
{
_borderPath = new();

int index = _shadowCanvas is not null ? 1 : 0;
Children.Insert(index, _borderPath);
}

IShape? borderShape = Border.Shape;
_borderPath?.UpdateBorderShape(borderShape, ActualWidth, ActualHeight);

_borderPath?.UpdateStroke(Border.Stroke);
_borderPath?.UpdateStrokeThickness(Border.StrokeThickness);
_borderPath?.UpdateStrokeDashPattern(Border.StrokeDashPattern);
_borderPath?.UpdateBorderDashOffset(Border.StrokeDashOffset);
_borderPath?.UpdateStrokeMiterLimit(Border.StrokeMiterLimit);
_borderPath?.UpdateStrokeLineCap(Border.StrokeLineCap);
_borderPath?.UpdateStrokeLineJoin(Border.StrokeLineJoin);
_borderPath.UpdateBorderShape(borderShape, ActualWidth, ActualHeight);

_borderPath.UpdateStroke(Border.Stroke);
_borderPath.UpdateStrokeThickness(Border.StrokeThickness);
_borderPath.UpdateStrokeDashPattern(Border.StrokeDashPattern);
_borderPath.UpdateBorderDashOffset(Border.StrokeDashOffset);
_borderPath.UpdateStrokeMiterLimit(Border.StrokeMiterLimit);
_borderPath.UpdateStrokeLineCap(Border.StrokeLineCap);
_borderPath.UpdateStrokeLineJoin(Border.StrokeLineJoin);
}

partial void ShadowChanged()
{
if (HasShadow)
{
UpdateShadowAsync().FireAndForget(IPlatformApplication.Current?.Services?.CreateLogger(nameof(WrapperView)));
}
else
{
CreateShadowAsync().FireAndForget(IPlatformApplication.Current?.Services?.CreateLogger(nameof(WrapperView)));
}
}

void OnChildSizeChanged(object sender, SizeChangedEventArgs e)
Expand All @@ -153,7 +170,7 @@ void OnChildSizeChanged(object sender, SizeChangedEventArgs e)
void OnChildVisibilityChanged(DependencyObject sender, DependencyProperty dp)
{
// OnChildSizeChanged does not fire for Visibility changes to child
if (sender is FrameworkElement child && _shadowCanvas.Children.Count > 0)
if (sender is FrameworkElement child && _shadowCanvas?.Children.Count > 0)
{
var shadowHost = _shadowCanvas.Children[0];
shadowHost.Visibility = child.Visibility;
Expand All @@ -162,14 +179,20 @@ void OnChildVisibilityChanged(DependencyObject sender, DependencyProperty dp)

void DisposeShadow()
{
if (_shadowCanvas == null)
if (_shadowCanvas is null)
{
return;
}

if (_shadowHost is not null)
{
ElementCompositionPreview.SetElementChildVisual(_shadowHost, null);
}

if (_shadowCanvas.Children.Count > 0)
{
_shadowCanvas.Children.RemoveAt(0);
}

if (_shadowVisual != null)
{
Expand All @@ -187,16 +210,28 @@ void DisposeShadow()
async Task CreateShadowAsync()
{
if (Child == null || Shadow == null || Shadow.Paint == null)
{
return;
}

var visual = ElementCompositionPreview.GetElementVisual(Child);

if (Clip != null && visual.Clip == null)
{
return;
}

double width = _shadowHostSize.Width;
double height = _shadowHostSize.Height;

if (_shadowCanvas is null)
{
_shadowCanvas = new();

// Shadow canvas must be the first child. The order of children (i.e. shadow canvas and border path) matters.
Children.Insert(0, _shadowCanvas);
}

var ttv = Child.TransformToVisual(_shadowCanvas);
global::Windows.Foundation.Point offset = ttv.TransformPoint(new global::Windows.Foundation.Point(0, 0));

Expand Down Expand Up @@ -229,7 +264,9 @@ async Task CreateShadowAsync()
async Task UpdateShadowAsync()
{
if (_dropShadow != null)
{
await SetShadowPropertiesAsync(_dropShadow, Shadow);
}

UpdateShadowSize();
}
Expand All @@ -241,12 +278,16 @@ void UpdateShadowSize()
float width = (float)_shadowHostSize.Width;

if (width <= 0)
{
width = (float)frameworkElement.ActualWidth;
}

float height = (float)_shadowHostSize.Height;

if (height <= 0)
{
height = (float)frameworkElement.ActualHeight;
}

if (_shadowVisual is not null)
{
Expand Down Expand Up @@ -283,7 +324,9 @@ async Task SetShadowPropertiesAsync(DropShadow dropShadow, IShadow? mauiShadow)
dropShadow.Opacity = opacity;

if (shadowColor != null)
{
dropShadow.Color = shadowColor.ToWindowsColor();
}

dropShadow.Offset = new Vector3((float)offset.X, (float)offset.Y, 0);
dropShadow.Mask = await Child.GetAlphaMaskAsync();
Expand Down
Loading