diff --git a/src/MaterialDesignThemes.Wpf/Internal/BindingProxy.cs b/src/MaterialDesignThemes.Wpf/Internal/BindingProxy.cs new file mode 100644 index 0000000000..d80010800a --- /dev/null +++ b/src/MaterialDesignThemes.Wpf/Internal/BindingProxy.cs @@ -0,0 +1,15 @@ +namespace MaterialDesignThemes.Wpf.Internal; + +public sealed class BindingProxy : Freezable +{ + protected override Freezable CreateInstanceCore() => new BindingProxy(); + + public static readonly DependencyProperty DataProperty = + DependencyProperty.Register(nameof(Data), typeof(object), typeof(BindingProxy), new PropertyMetadata(null)); + + public object? Data + { + get => GetValue(DataProperty); + set => SetValue(DataProperty, value); + } +} diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ProgressBar.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ProgressBar.xaml index 4ad30d2d68..2dda60a645 100644 --- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ProgressBar.xaml +++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ProgressBar.xaml @@ -2,6 +2,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:circularProgressBarConverters="clr-namespace:MaterialDesignThemes.Wpf.Converters.CircularProgressBar" xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters" + xmlns:internal="clr-namespace:MaterialDesignThemes.Wpf.Internal" xmlns:transitions="clr-namespace:MaterialDesignThemes.Wpf.Transitions" xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf"> @@ -173,6 +174,9 @@ + + + @@ -184,11 +188,11 @@ StrokeThickness="3"> - - + + - + @@ -196,10 +200,10 @@ - + - + @@ -212,7 +216,7 @@ - + diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Slider.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Slider.xaml index 03128d77b9..6c8d83942c 100644 --- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Slider.xaml +++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Slider.xaml @@ -2,6 +2,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters" xmlns:convertersInternal="clr-namespace:MaterialDesignThemes.Wpf.Converters.Internal" + xmlns:internal="clr-namespace:MaterialDesignThemes.Wpf.Internal" xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf"> @@ -267,10 +268,13 @@ IsHitTestVisible="False" RenderTransformOrigin="0.5,1" Visibility="Collapsed"> + + + - + @@ -479,10 +483,13 @@ IsHitTestVisible="False" RenderTransformOrigin="1,0.5" Visibility="Collapsed"> + + + - +