From 2e0183b78ade1684477316ee57f91ac7c41f0b0b Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Fri, 24 Apr 2026 15:11:17 +0200
Subject: [PATCH 1/2] Introduce BindingProxy to mitigate temporary XAML binding
 failures

---
 src/MaterialDesignThemes.Wpf/BindingProxy.cs      | 15 +++++++++++++++
 .../Themes/MaterialDesignTheme.ProgressBar.xaml   | 15 +++++++++------
 .../Themes/MaterialDesignTheme.Slider.xaml        | 10 ++++++++--
 3 files changed, 32 insertions(+), 8 deletions(-)
 create mode 100644 src/MaterialDesignThemes.Wpf/BindingProxy.cs

diff --git a/src/MaterialDesignThemes.Wpf/BindingProxy.cs b/src/MaterialDesignThemes.Wpf/BindingProxy.cs
new file mode 100644
index 0000000000..997fb4e4a0
--- /dev/null
+++ b/src/MaterialDesignThemes.Wpf/BindingProxy.cs
@@ -0,0 +1,15 @@
+namespace MaterialDesignThemes.Wpf;
+
+public 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..ce97e89437 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ProgressBar.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ProgressBar.xaml
@@ -173,6 +173,9 @@
             </Grid>
             <Grid x:Name="PathGrid" Margin="2" />
             <Canvas>
+              <Canvas.Resources>
+                <wpf:BindingProxy x:Key="PathGridProxy" Data="{Binding ElementName=PathGrid}" />
+              </Canvas.Resources>
               <Ellipse Width="{TemplateBinding Width}"
                        Height="{TemplateBinding Height}"
                        Fill="{TemplateBinding Background}" />
@@ -184,11 +187,11 @@
                     StrokeThickness="3">
                 <Path.Data>
                   <PathGeometry>
-                    <PathFigure StartPoint="{Binding ElementName=PathGrid, Path=ActualWidth, Converter={x:Static circularProgressBarConverters:StartPointConverter.Instance}, Mode=OneWay}">
-                      <ArcSegment Size="{Binding ElementName=PathGrid, Path=ActualWidth, Converter={x:Static circularProgressBarConverters:ArcSizeConverter.Instance}, Mode=OneWay}" SweepDirection="Clockwise">
+                    <PathFigure StartPoint="{Binding Source={StaticResource PathGridProxy}, Path=Data.ActualWidth, Converter={x:Static circularProgressBarConverters:StartPointConverter.Instance}, Mode=OneWay}">
+                      <ArcSegment Size="{Binding Source={StaticResource PathGridProxy}, Path=Data.ActualWidth, Converter={x:Static circularProgressBarConverters:ArcSizeConverter.Instance}, Mode=OneWay}" SweepDirection="Clockwise">
                         <ArcSegment.Point>
                           <MultiBinding Converter="{x:Static circularProgressBarConverters:ArcEndPointConverter.Instance}" ConverterParameter="{x:Static circularProgressBarConverters:ArcEndPointConverter.ParameterMidPoint}">
-                            <Binding ElementName="PathGrid" Path="ActualWidth" />
+                            <Binding Source="{StaticResource PathGridProxy}" Path="Data.ActualWidth" />
                             <Binding Path="Value" RelativeSource="{RelativeSource TemplatedParent}" />
                             <Binding Path="Minimum" RelativeSource="{RelativeSource TemplatedParent}" />
                             <Binding Path="Maximum" RelativeSource="{RelativeSource TemplatedParent}" />
@@ -196,10 +199,10 @@
                           </MultiBinding>
                         </ArcSegment.Point>
                       </ArcSegment>
-                      <ArcSegment Size="{Binding ElementName=PathGrid, Path=ActualWidth, Converter={x:Static circularProgressBarConverters:ArcSizeConverter.Instance}, Mode=OneWay}" SweepDirection="Clockwise">
+                      <ArcSegment Size="{Binding Source={StaticResource PathGridProxy}, Path=Data.ActualWidth, Converter={x:Static circularProgressBarConverters:ArcSizeConverter.Instance}, Mode=OneWay}" SweepDirection="Clockwise">
                         <ArcSegment.Point>
                           <MultiBinding Converter="{x:Static circularProgressBarConverters:ArcEndPointConverter.Instance}">
-                            <Binding ElementName="PathGrid" Path="ActualWidth" />
+                            <Binding Source="{StaticResource PathGridProxy}" Path="Data.ActualWidth" />
                             <Binding Path="Value" RelativeSource="{RelativeSource TemplatedParent}" />
                             <Binding Path="Minimum" RelativeSource="{RelativeSource TemplatedParent}" />
                             <Binding Path="Maximum" RelativeSource="{RelativeSource TemplatedParent}" />
@@ -212,7 +215,7 @@
                 </Path.Data>
                 <Path.RenderTransform>
                   <TransformGroup>
-                    <RotateTransform x:Name="RotateTransform" CenterX="{Binding ElementName=PathGrid, Path=ActualWidth, Converter={x:Static circularProgressBarConverters:RotateTransformCentreConverter.Instance}, Mode=OneWay}" CenterY="{Binding ElementName=PathGrid, Path=ActualWidth, Converter={x:Static circularProgressBarConverters:RotateTransformCentreConverter.Instance}, Mode=OneWay}" />
+                    <RotateTransform x:Name="RotateTransform" CenterX="{Binding Source={StaticResource PathGridProxy}, Path=Data.ActualWidth, Converter={x:Static circularProgressBarConverters:RotateTransformCentreConverter.Instance}, Mode=OneWay}" CenterY="{Binding Source={StaticResource PathGridProxy}, Path=Data.ActualWidth, Converter={x:Static circularProgressBarConverters:RotateTransformCentreConverter.Instance}, Mode=OneWay}" />
                   </TransformGroup>
                 </Path.RenderTransform>
               </Path>
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Slider.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Slider.xaml
index 03128d77b9..bcf766225c 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Slider.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Slider.xaml
@@ -267,10 +267,13 @@
               IsHitTestVisible="False"
               RenderTransformOrigin="0.5,1"
               Visibility="Collapsed">
+          <Grid.Resources>
+            <wpf:BindingProxy x:Key="labelProxy" Data="{Binding ElementName=label}" />
+          </Grid.Resources>
           <Grid.RenderTransform>
             <TransformGroup>
               <ScaleTransform ScaleX="0" ScaleY="0" />
-              <TranslateTransform X="{Binding ActualWidth, ElementName=label, Converter={x:Static convertersInternal:SliderValueLabelPositionConverter.Instance}, ConverterParameter={x:Static Orientation.Horizontal}}" Y="-40" />
+              <TranslateTransform X="{Binding Data.ActualWidth, Source={StaticResource labelProxy}, Converter={x:Static convertersInternal:SliderValueLabelPositionConverter.Instance}, ConverterParameter={x:Static Orientation.Horizontal}}" Y="-40" />
             </TransformGroup>
           </Grid.RenderTransform>
           <AdornerDecorator CacheMode="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:ShadowAssist.CacheMode)}">
@@ -479,10 +482,13 @@
               IsHitTestVisible="False"
               RenderTransformOrigin="1,0.5"
               Visibility="Collapsed">
+          <Grid.Resources>
+            <wpf:BindingProxy x:Key="labelProxy" Data="{Binding ElementName=label}" />
+          </Grid.Resources>
           <Grid.RenderTransform>
             <TransformGroup>
               <ScaleTransform ScaleX="0" ScaleY="0" />
-              <TranslateTransform X="{Binding ActualWidth, ElementName=label, Converter={x:Static convertersInternal:SliderValueLabelPositionConverter.Instance}, ConverterParameter={x:Static Orientation.Vertical}}" Y="-7" />
+              <TranslateTransform X="{Binding Data.ActualWidth, Source={StaticResource labelProxy}, Converter={x:Static convertersInternal:SliderValueLabelPositionConverter.Instance}, ConverterParameter={x:Static Orientation.Vertical}}" Y="-7" />
             </TransformGroup>
           </Grid.RenderTransform>
           <AdornerDecorator CacheMode="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:ShadowAssist.CacheMode)}">

From b8eb1886bcfedd2d51ab2a671368a7037b8d560a Mon Sep 17 00:00:00 2001
From: Kevin Bost <kitokeboo@gmail.com>
Date: Thu, 30 Apr 2026 21:57:44 -0700
Subject: [PATCH 2/2] Internalize BindingProxy and seal the class

Moves `BindingProxy` to the `MaterialDesignThemes.Wpf.Internal` namespace and marks it as `sealed`. This change clarifies that `BindingProxy` is an internal implementation detail of the library, preventing direct external usage or inheritance and helping to maintain a cleaner public API surface.

Relates to #3814
---
 src/MaterialDesignThemes.Wpf/{ => Internal}/BindingProxy.cs  | 4 ++--
 .../Themes/MaterialDesignTheme.ProgressBar.xaml              | 3 ++-
 .../Themes/MaterialDesignTheme.Slider.xaml                   | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)
 rename src/MaterialDesignThemes.Wpf/{ => Internal}/BindingProxy.cs (80%)

diff --git a/src/MaterialDesignThemes.Wpf/BindingProxy.cs b/src/MaterialDesignThemes.Wpf/Internal/BindingProxy.cs
similarity index 80%
rename from src/MaterialDesignThemes.Wpf/BindingProxy.cs
rename to src/MaterialDesignThemes.Wpf/Internal/BindingProxy.cs
index 997fb4e4a0..d80010800a 100644
--- a/src/MaterialDesignThemes.Wpf/BindingProxy.cs
+++ b/src/MaterialDesignThemes.Wpf/Internal/BindingProxy.cs
@@ -1,6 +1,6 @@
-namespace MaterialDesignThemes.Wpf;
+namespace MaterialDesignThemes.Wpf.Internal;
 
-public class BindingProxy : Freezable
+public sealed class BindingProxy : Freezable
 {
     protected override Freezable CreateInstanceCore() => new BindingProxy();
 
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ProgressBar.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ProgressBar.xaml
index ce97e89437..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">
 
@@ -174,7 +175,7 @@
             <Grid x:Name="PathGrid" Margin="2" />
             <Canvas>
               <Canvas.Resources>
-                <wpf:BindingProxy x:Key="PathGridProxy" Data="{Binding ElementName=PathGrid}" />
+                <internal:BindingProxy x:Key="PathGridProxy" Data="{Binding ElementName=PathGrid}" />
               </Canvas.Resources>
               <Ellipse Width="{TemplateBinding Width}"
                        Height="{TemplateBinding Height}"
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Slider.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Slider.xaml
index bcf766225c..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">
 
   <ResourceDictionary.MergedDictionaries>
@@ -268,7 +269,7 @@
               RenderTransformOrigin="0.5,1"
               Visibility="Collapsed">
           <Grid.Resources>
-            <wpf:BindingProxy x:Key="labelProxy" Data="{Binding ElementName=label}" />
+            <internal:BindingProxy x:Key="labelProxy" Data="{Binding ElementName=label}" />
           </Grid.Resources>
           <Grid.RenderTransform>
             <TransformGroup>
@@ -483,7 +484,7 @@
               RenderTransformOrigin="1,0.5"
               Visibility="Collapsed">
           <Grid.Resources>
-            <wpf:BindingProxy x:Key="labelProxy" Data="{Binding ElementName=label}" />
+            <internal:BindingProxy x:Key="labelProxy" Data="{Binding ElementName=label}" />
           </Grid.Resources>
           <Grid.RenderTransform>
             <TransformGroup>