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

[SettingsExpander] Fix CornerRadius bug #329

Merged
merged 7 commits into from
Feb 1, 2024
Merged

[SettingsExpander] Fix CornerRadius bug #329

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
fe5b543
Adding converter for cornerradius
niels9001 Jan 30, 2024
62ab450
Setting the corner radius
niels9001 Jan 30, 2024
22296a2
XAML styler
niels9001 Jan 30, 2024
e1b3bff
Remove cornerradius override from sample
niels9001 Jan 30, 2024
34dfc12
Merge branch 'main' into niels9001/settingsexpander-cornerradius-fix
niels9001 Jan 30, 2024
33f2553
Merge branch 'main' into niels9001/settingsexpander-cornerradius-fix
Arlodotexe Jan 30, 2024
040ab7e
Merge branch 'main' into niels9001/settingsexpander-cornerradius-fix
Arlodotexe Jan 31, 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
3 changes: 2 additions & 1 deletion components/SettingsControls/samples/SettingsExpanderSample.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- 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. -->
<!-- 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. -->
<Page x:Class="SettingsControlsExperiment.Samples.SettingsExpanderSample"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Expand All @@ -9,6 +9,7 @@
mc:Ignorable="d">

<local:SettingsExpander x:Name="settingsCard"
VerticalAlignment="Top"
Description="The SettingsExpander has the same properties as a Card, and you can set SettingsCard as part of the Items collection."
Header="SettingsExpander"
HeaderIcon="{ui:FontIcon Glyph=&#xE91B;}"
Expand Down
24 changes: 24 additions & 0 deletions components/SettingsControls/src/Helpers/CornerRadiusConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// 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.

namespace CommunityToolkit.WinUI.Controls;
internal class CornerRadiusConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, string language)
{
if (value is CornerRadius cornerRadius)
{
return new CornerRadius(0, 0, cornerRadius.BottomRight, cornerRadius.BottomLeft);
}
else
{
return value;
}
}

public object ConvertBack(object value, Type targetType, object parameter, string language)
{
return value;
}
}
6 changes: 4 additions & 2 deletions components/SettingsControls/src/SettingsExpander/SettingsExpander.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- 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. -->
<!-- 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. -->
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
Expand All @@ -20,6 +20,8 @@
<x:Double x:Key="SettingsExpanderChevronButtonWidth">32</x:Double>
<x:Double x:Key="SettingsExpanderChevronButtonHeight">32</x:Double>

<local:CornerRadiusConverter x:Key="CornerRadiusConverter" />

<Style x:Key="DefaultSettingsExpanderItemStyle"
BasedOn="{StaticResource DefaultSettingsCardStyle}"
TargetType="local:SettingsCard">
Expand Down Expand Up @@ -93,7 +95,7 @@
IsClickEnabled="False" />
</muxc:Expander.Header>
<muxc:Expander.Content>
<Grid>
<Grid CornerRadius="{Binding CornerRadius, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusConverter}}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
Expand Down
Loading