Skip to content

ToggleButton uses EllipseClipConverter #3867

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
Keboo merged 2 commits into from
Jun 13, 2025
Merged

ToggleButton uses EllipseClipConverter #3867

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f05150
ToggleButton uses EllipseClipConverter
JorisCleVR Jun 10, 2025
5fe460d
EllipseClipConverter: Changed to file-scoped namespace
JorisCleVR Jun 11, 2025
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
Next Next commit
ToggleButton uses EllipseClipConverter
  • Loading branch information
@JorisCleVR
JorisCleVR committed Jun 10, 2025
commit 4f05150cee1476002b9760a576215a0693bddadc
41 changes: 41 additions & 0 deletions src/MaterialDesignThemes.Wpf/Converters/EllipseClipConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Data;
using System.Windows.Media;

namespace MaterialDesignThemes.Wpf.Converters
Copy link
Member

@Keboo Keboo Jun 10, 2025

Choose a reason for hiding this comment

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

nit: We have been favoring file-scoped namespaces

Copy link
Contributor Author

@JorisCleVR JorisCleVR Jun 11, 2025

Choose a reason for hiding this comment

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

Indeed good to keep consistency in the code base: Fixed

{
public class EllipseClipConverter : IMultiValueConverter
{
public static readonly EllipseClipConverter Instance = new();

public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
{
if (values is [double width, double height, ..])
{
if (width < 1.0 || height < 1.0)
{
return Geometry.Empty;
}

Point center = new Point(width / 2.0, height / 2.0);
double radiusX = width / 2.0;
double radiusY = height / 2.0;

EllipseGeometry geometry = new EllipseGeometry(center, radiusX, radiusY);
geometry.Freeze();

return geometry;
}

return DependencyProperty.UnsetValue;
}

public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
=> throw new NotImplementedException();
}
}
36 changes: 8 additions & 28 deletions src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToggleButton.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,20 +136,10 @@
ContentTemplate="{TemplateBinding ContentTemplate}"
FlowDirection="LeftToRight" />
<Grid.Clip>
<EllipseGeometry RadiusX="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Width, Converter={x:Static converters:MathConverter.DivideInstance}, ConverterParameter=2.0}" RadiusY="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Height, Converter={x:Static converters:MathConverter.DivideInstance}, ConverterParameter=2.0}">
<EllipseGeometry.Center>
<MultiBinding Converter="{x:Static converters:PointValueConverter.Instance}">
<Binding Converter="{x:Static converters:MathConverter.DivideInstance}"
ConverterParameter="2.0"
Path="Width"
RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Converter="{x:Static converters:MathConverter.DivideInstance}"
ConverterParameter="2.0"
Path="Height"
RelativeSource="{RelativeSource TemplatedParent}" />
</MultiBinding>
</EllipseGeometry.Center>
</EllipseGeometry>
<MultiBinding Converter="{x:Static converters:EllipseClipConverter.Instance}">
<Binding Path="ActualWidth" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="ActualHeight" RelativeSource="{RelativeSource TemplatedParent}" />
</MultiBinding>
</Grid.Clip>
<Grid.RenderTransform>
<ScaleTransform x:Name="OffScaleTransform" ScaleX="1" ScaleY="1" />
Expand All @@ -164,20 +154,10 @@
ContentTemplate="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ToggleButtonAssist.OnContentTemplate)}"
FlowDirection="LeftToRight" />
<Grid.Clip>
<EllipseGeometry RadiusX="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Width, Converter={x:Static converters:MathConverter.DivideInstance}, ConverterParameter=2.0}" RadiusY="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Height, Converter={x:Static converters:MathConverter.DivideInstance}, ConverterParameter=2.0}">
<EllipseGeometry.Center>
<MultiBinding Converter="{x:Static converters:PointValueConverter.Instance}">
<Binding Converter="{x:Static converters:MathConverter.DivideInstance}"
ConverterParameter="2.0"
Path="Width"
RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Converter="{x:Static converters:MathConverter.DivideInstance}"
ConverterParameter="2.0"
Path="Height"
RelativeSource="{RelativeSource TemplatedParent}" />
</MultiBinding>
</EllipseGeometry.Center>
</EllipseGeometry>
<MultiBinding Converter="{x:Static converters:EllipseClipConverter.Instance}">
<Binding Path="ActualWidth" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="ActualHeight" RelativeSource="{RelativeSource TemplatedParent}" />
</MultiBinding>
</Grid.Clip>
<Grid.RenderTransform>
<ScaleTransform x:Name="OnScaleTransform" ScaleX="0" ScaleY="1" />
Expand Down
Loading