Skip to content

Revert usage of x:Reference #3886

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Revert usage of x:Reference #3886

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
56 changes: 28 additions & 28 deletions src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Button.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@
Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.Value)}">
<ProgressBar.Clip>
<MultiBinding Converter="{x:Static converters:BorderClipConverter.Instance}">
<Binding Source="{x:Reference border}" Path="ActualWidth" />
<Binding Source="{x:Reference border}" Path="ActualHeight" />
<Binding Source="{x:Reference border}" Path="CornerRadius" />
<Binding Source="{x:Reference border}" Path="BorderThickness" />
<Binding ElementName="border" Path="ActualWidth" />
<Binding ElementName="border" Path="ActualHeight" />
<Binding ElementName="border" Path="CornerRadius" />
<Binding ElementName="border" Path="BorderThickness" />
</MultiBinding>
</ProgressBar.Clip>
</ProgressBar>
Expand All @@ -87,10 +87,10 @@
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
<wpf:Ripple.Clip>
<MultiBinding Converter="{x:Static converters:BorderClipConverter.Instance}">
<Binding Source="{x:Reference border}" Path="ActualWidth" />
<Binding Source="{x:Reference border}" Path="ActualHeight" />
<Binding Source="{x:Reference border}" Path="CornerRadius" />
<Binding Source="{x:Reference border}" Path="BorderThickness" />
<Binding ElementName="border" Path="ActualWidth" />
<Binding ElementName="border" Path="ActualHeight" />
<Binding ElementName="border" Path="CornerRadius" />
<Binding ElementName="border" Path="BorderThickness" />
</MultiBinding>
</wpf:Ripple.Clip>
</wpf:Ripple>
Expand Down Expand Up @@ -199,10 +199,10 @@
Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.Value)}">
<ProgressBar.Clip>
<MultiBinding Converter="{x:Static converters:BorderClipConverter.Instance}">
<Binding Source="{x:Reference border}" Path="ActualWidth" />
<Binding Source="{x:Reference border}" Path="ActualHeight" />
<Binding Source="{x:Reference border}" Path="CornerRadius" />
<Binding Source="{x:Reference border}" Path="BorderThickness" />
<Binding ElementName="border" Path="ActualWidth" />
<Binding ElementName="border" Path="ActualHeight" />
<Binding ElementName="border" Path="CornerRadius" />
<Binding ElementName="border" Path="BorderThickness" />
</MultiBinding>
</ProgressBar.Clip>
</ProgressBar>
Expand All @@ -217,10 +217,10 @@
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
<wpf:Ripple.Clip>
<MultiBinding Converter="{x:Static converters:BorderClipConverter.Instance}">
<Binding Source="{x:Reference border}" Path="ActualWidth" />
<Binding Source="{x:Reference border}" Path="ActualHeight" />
<Binding Source="{x:Reference border}" Path="CornerRadius" />
<Binding Source="{x:Reference border}" Path="BorderThickness" />
<Binding ElementName="border" Path="ActualWidth" />
<Binding ElementName="border" Path="ActualHeight" />
<Binding ElementName="border" Path="CornerRadius" />
<Binding ElementName="border" Path="BorderThickness" />
</MultiBinding>
</wpf:Ripple.Clip>
</wpf:Ripple>
Expand Down Expand Up @@ -357,10 +357,10 @@
Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.Value)}">
<ProgressBar.Clip>
<MultiBinding Converter="{x:Static converters:BorderClipConverter.Instance}">
<Binding Source="{x:Reference border}" Path="ActualWidth" />
<Binding Source="{x:Reference border}" Path="ActualHeight" />
<Binding Source="{x:Reference border}" Path="CornerRadius" />
<Binding Source="{x:Reference border}" Path="BorderThickness" />
<Binding ElementName="border" Path="ActualWidth" />
<Binding ElementName="border" Path="ActualHeight" />
<Binding ElementName="border" Path="CornerRadius" />
<Binding ElementName="border" Path="BorderThickness" />
</MultiBinding>
</ProgressBar.Clip>
</ProgressBar>
Expand All @@ -375,10 +375,10 @@
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
<wpf:Ripple.Clip>
<MultiBinding Converter="{x:Static converters:BorderClipConverter.Instance}">
<Binding Source="{x:Reference border}" Path="ActualWidth" />
<Binding Source="{x:Reference border}" Path="ActualHeight" />
<Binding Source="{x:Reference border}" Path="CornerRadius" />
<Binding Source="{x:Reference border}" Path="BorderThickness" />
<Binding ElementName="border" Path="ActualWidth" />
<Binding ElementName="border" Path="ActualHeight" />
<Binding ElementName="border" Path="CornerRadius" />
<Binding ElementName="border" Path="BorderThickness" />
</MultiBinding>
</wpf:Ripple.Clip>
</wpf:Ripple>
Expand Down Expand Up @@ -802,10 +802,10 @@
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
<wpf:Ripple.Clip>
<MultiBinding Converter="{x:Static converters:BorderClipConverter.Instance}">
<Binding Source="{x:Reference border}" Path="ActualWidth" />
<Binding Source="{x:Reference border}" Path="ActualHeight" />
<Binding Source="{x:Reference border}" Path="CornerRadius" />
<Binding Source="{x:Reference border}" Path="BorderThickness" />
<Binding ElementName="border" Path="ActualWidth" />
<Binding ElementName="border" Path="ActualHeight" />
<Binding ElementName="border" Path="CornerRadius" />
<Binding ElementName="border" Path="BorderThickness" />
</MultiBinding>
</wpf:Ripple.Clip>
</wpf:Ripple>
Expand Down
18 changes: 8 additions & 10 deletions src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ProgressBar.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,26 +184,26 @@
StrokeThickness="3">
<Path.Data>
<PathGeometry>
<PathFigure StartPoint="{Binding Source={x:Reference PathGrid}, Path=ActualWidth, Converter={x:Static circularProgressBarConverters:StartPointConverter.Instance}, Mode=OneWay}">
<ArcSegment Size="{Binding Source={x:Reference PathGrid}, Path=ActualWidth, Converter={x:Static circularProgressBarConverters:ArcSizeConverter.Instance}, Mode=OneWay}" SweepDirection="Clockwise">
<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">
<ArcSegment.Point>
<MultiBinding Converter="{x:Static circularProgressBarConverters:ArcEndPointConverter.Instance}" ConverterParameter="{x:Static circularProgressBarConverters:ArcEndPointConverter.ParameterMidPoint}">
<Binding Source="{x:Reference PathGrid}" Path="ActualWidth" />
<Binding ElementName="PathGrid" Path="ActualWidth" />
<Binding Path="Value" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="Minimum" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="Maximum" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Source="{x:Reference FullyIndeterminateGridScaleTransform}" Path="ScaleX" />
<Binding ElementName="FullyIndeterminateGridScaleTransform" Path="ScaleX" />
</MultiBinding>
</ArcSegment.Point>
</ArcSegment>
<ArcSegment Size="{Binding Source={x:Reference PathGrid}, Path=ActualWidth, Converter={x:Static circularProgressBarConverters:ArcSizeConverter.Instance}, Mode=OneWay}" SweepDirection="Clockwise">
<ArcSegment Size="{Binding ElementName=PathGrid, Path=ActualWidth, Converter={x:Static circularProgressBarConverters:ArcSizeConverter.Instance}, Mode=OneWay}" SweepDirection="Clockwise">
<ArcSegment.Point>
<MultiBinding Converter="{x:Static circularProgressBarConverters:ArcEndPointConverter.Instance}">
<Binding Source="{x:Reference PathGrid}" Path="ActualWidth" />
<Binding ElementName="PathGrid" Path="ActualWidth" />
<Binding Path="Value" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="Minimum" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="Maximum" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Source="{x:Reference FullyIndeterminateGridScaleTransform}" Path="ScaleX" />
<Binding ElementName="FullyIndeterminateGridScaleTransform" Path="ScaleX" />
</MultiBinding>
</ArcSegment.Point>
</ArcSegment>
Expand All @@ -212,9 +212,7 @@
</Path.Data>
<Path.RenderTransform>
<TransformGroup>
<RotateTransform x:Name="RotateTransform"
CenterX="{Binding Source={x:Reference PathGrid}, Path=ActualWidth, Converter={x:Static circularProgressBarConverters:RotateTransformCentreConverter.Instance}, Mode=OneWay}"
CenterY="{Binding Source={x:Reference PathGrid}, Path=ActualWidth, Converter={x:Static circularProgressBarConverters:RotateTransformCentreConverter.Instance}, Mode=OneWay}" />
<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}" />
</TransformGroup>
</Path.RenderTransform>
</Path>
Expand Down
Loading