Skip to content

Add custom alpha mask support to DropShadowPanel #4107

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

Merged
merged 7 commits into from
Jul 23, 2021
Merged

Add custom alpha mask support to DropShadowPanel #4107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
43de39a
Add support for custom shadow alpha masks
arcadiogarcia Jul 13, 2021
24f22d6
Remove namespace
arcadiogarcia Jul 13, 2021
1a7c00b
Add header
arcadiogarcia Jul 13, 2021
1298137
Address PR feedback
arcadiogarcia Jul 20, 2021
ba64129
Merge branch 'main' into user/arcadiog/dropShadowMask
arcadiogarcia Jul 20, 2021
df40456
Address PR feeback
arcadiogarcia Jul 22, 2021
99ce32a
Merge branch 'user/arcadiog/dropShadowMask' of https://github.com/arc…
arcadiogarcia Jul 22, 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
9 changes: 7 additions & 2 deletions Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

using System;
using System.Numerics;
using System.Threading.Tasks;
using Windows.UI;
using Windows.UI.Composition;
using Windows.UI.Xaml;
Expand Down Expand Up @@ -168,7 +167,13 @@ private void UpdateShadowMask()
{
CompositionBrush mask = null;

if (Content is Image)
// We check for IAlphaMaskProvider first, to ensure that we use the custom
// alpha mask even if Content happens to extend any of the other classes
if (Content is IAlphaMaskProvider maskedControl)
{
mask = maskedControl.GetAlphaMask();
}
else if (Content is Image)
{
mask = ((Image)Content).GetAlphaMask();
}
Expand Down
20 changes: 20 additions & 0 deletions Microsoft.Toolkit.Uwp.UI/Helpers/IAlphaMaskProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Windows.UI.Composition;

namespace Microsoft.Toolkit.Uwp.UI
{
/// <summary>
/// Any user control can implement this interface to provide a custom alpha mask to it's parent DropShadowPanel
/// </summary>
public interface IAlphaMaskProvider
{
/// <summary>
/// This method should return the appropiate alpha mask to be used in the shadow of this control
/// </summary>
/// <returns>The alpha mask as a composition brush</returns>
CompositionBrush GetAlphaMask();
}
}