Skip to content

Fixed ImageEx.CornerRadius property #3529

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
1 commit merged into from
Oct 15, 2020
Merged

Fixed ImageEx.CornerRadius property #3529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="controls:ImageEx">
<Grid Background="{TemplateBinding Background}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
<Grid Background="{TemplateBinding Background}"
CornerRadius="{TemplateBinding CornerRadius}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}">
<Image Name="PlaceholderImage"
HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
VerticalAlignment="{TemplateBinding VerticalAlignment}"
Expand Down
15 changes: 0 additions & 15 deletions Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Members.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@ public partial class ImageExBase
/// </summary>
public static readonly DependencyProperty StretchProperty = DependencyProperty.Register(nameof(Stretch), typeof(Stretch), typeof(ImageExBase), new PropertyMetadata(Stretch.Uniform));

/// <summary>
/// Identifies the <see cref="CornerRadius"/> dependency property.
/// </summary>
public static new readonly DependencyProperty CornerRadiusProperty = DependencyProperty.Register(nameof(CornerRadius), typeof(CornerRadius), typeof(ImageExBase), new PropertyMetadata(new CornerRadius(0)));

/// <summary>
/// Identifies the <see cref="DecodePixelHeight"/> dependency property.
/// </summary>
Expand Down Expand Up @@ -81,16 +76,6 @@ public partial class ImageExBase
/// </summary>
public bool IsInitialized { get; private set; }

/// <summary>
/// Gets or sets the CornerRadius for underlying image. <para/>
/// Used to created rounded/circular images.
/// </summary>
public new CornerRadius CornerRadius
{
get { return (CornerRadius)GetValue(CornerRadiusProperty); }
set { SetValue(CornerRadiusProperty, value); }
}

/// <summary>
/// Gets or sets DecodePixelHeight for underlying bitmap
/// </summary>
Expand Down