Skip to content

Commit

Permalink
Use more direct bindings instead of traversing the visual tree (#3595)
Browse files Browse the repository at this point in the history
  • Loading branch information
@nicolaihenriksen
nicolaihenriksen committed Jun 20, 2024
1 parent eb41544 commit 572eccc
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 24 deletions.
4 changes: 2 additions & 2 deletions src/MaterialDesignThemes.Wpf/RatingBar.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ private void RebuildButtons()
{
for (int i = Max; i >= start; i--)
{
var ratingBarButton = new RatingBarButton
var ratingBarButton = new RatingBarButton(this)
{
Content = i,
ContentTemplate = ValueItemTemplate,
Expand All @@ -340,7 +340,7 @@ private void RebuildButtons()
{
for (int i = start; i <= Max; i++)
{
var ratingBarButton = new RatingBarButton
var ratingBarButton = new RatingBarButton(this)
{
Content = i,
ContentTemplate = ValueItemTemplate,
Expand Down
9 changes: 9 additions & 0 deletions src/MaterialDesignThemes.Wpf/RatingBarButton.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,13 @@ public int Value
get => (int)GetValue(ValueProperty);
internal set => SetValue(ValuePropertyKey, value);
}

public RatingBar RatingBar { get; } = null!; // Null initializer added to suppress warning (for the obsoleted empty constructor)

public RatingBarButton(RatingBar ratingBar) => RatingBar = ratingBar;

// Only added the default constructor for back-compat. Ideally should not be used from MDIX consumers, but you never know.
[Obsolete("Should not be used. Use the constructor taking a RatingBar instance as parameter instead. This constructor will be removed in a future version.")]
public RatingBarButton()
{ }
}
44 changes: 22 additions & 22 deletions src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.RatingBar.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
<TextBlock.Foreground>
<MultiBinding Converter="{x:Static wpf:RatingBar+TextBlockForegroundConverter.Instance}">
<Binding Path="Tag" RelativeSource="{RelativeSource Self}" />
<Binding Path="Orientation" RelativeSource="{RelativeSource FindAncestor, AncestorType=wpf:RatingBar}" />
<Binding Path="InvertDirection" RelativeSource="{RelativeSource FindAncestor, AncestorType=wpf:RatingBar}" />
<Binding Path="Value" RelativeSource="{RelativeSource FindAncestor, AncestorType=wpf:RatingBar}" />
<Binding Path="RatingBar.Orientation" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="RatingBar.InvertDirection" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="RatingBar.Value" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="Value" RelativeSource="{RelativeSource TemplatedParent}" />
</MultiBinding>
</TextBlock.Foreground>
Expand All @@ -70,10 +70,10 @@
<MultiBinding Converter="{x:Static wpf:RatingBar+PreviewIndicatorTransformXConverter.Instance}">
<Binding Path="ActualWidth" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding ElementName="previewValueHorizontal" Path="ActualWidth" />
<Binding Path="Orientation" RelativeSource="{RelativeSource FindAncestor, AncestorType=wpf:RatingBar}" />
<Binding Path="InvertDirection" RelativeSource="{RelativeSource FindAncestor, AncestorType=wpf:RatingBar}" />
<Binding Path="IsFractionalValueEnabled" RelativeSource="{RelativeSource FindAncestor, AncestorType=wpf:RatingBar}" />
<Binding Path="PreviewValue" RelativeSource="{RelativeSource FindAncestor, AncestorType=wpf:RatingBar}" />
<Binding Path="RatingBar.Orientation" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="RatingBar.InvertDirection" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="RatingBar.IsFractionalValueEnabled" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="RatingBar.PreviewValue" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="Value" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="IsMouseOver" RelativeSource="{RelativeSource TemplatedParent}" />
</MultiBinding>
Expand All @@ -82,10 +82,10 @@
<MultiBinding Converter="{x:Static wpf:RatingBar+PreviewIndicatorTransformYConverter.Instance}">
<Binding Path="ActualHeight" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding ElementName="previewValueHorizontal" Path="ActualHeight" />
<Binding Path="Orientation" RelativeSource="{RelativeSource FindAncestor, AncestorType=wpf:RatingBar}" />
<Binding Path="InvertDirection" RelativeSource="{RelativeSource FindAncestor, AncestorType=wpf:RatingBar}" />
<Binding Path="IsFractionalValueEnabled" RelativeSource="{RelativeSource FindAncestor, AncestorType=wpf:RatingBar}" />
<Binding Path="PreviewValue" RelativeSource="{RelativeSource FindAncestor, AncestorType=wpf:RatingBar}" />
<Binding Path="RatingBar.Orientation" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="RatingBar.InvertDirection" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="RatingBar.IsFractionalValueEnabled" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="RatingBar.PreviewValue" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="Value" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="IsMouseOver" RelativeSource="{RelativeSource TemplatedParent}" />
</MultiBinding>
Expand Down Expand Up @@ -123,10 +123,10 @@
<MultiBinding Converter="{x:Static wpf:RatingBar+PreviewIndicatorTransformXConverter.Instance}">
<Binding Path="ActualWidth" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding ElementName="previewValueVertical" Path="ActualWidth" />
<Binding Path="Orientation" RelativeSource="{RelativeSource FindAncestor, AncestorType=wpf:RatingBar}" />
<Binding Path="InvertDirection" RelativeSource="{RelativeSource FindAncestor, AncestorType=wpf:RatingBar}" />
<Binding Path="IsFractionalValueEnabled" RelativeSource="{RelativeSource FindAncestor, AncestorType=wpf:RatingBar}" />
<Binding Path="PreviewValue" RelativeSource="{RelativeSource FindAncestor, AncestorType=wpf:RatingBar}" />
<Binding Path="RatingBar.Orientation" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="RatingBar.InvertDirection" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="RatingBar.IsFractionalValueEnabled" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="RatingBar.PreviewValue" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="Value" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="IsMouseOver" RelativeSource="{RelativeSource TemplatedParent}" />
</MultiBinding>
Expand All @@ -135,10 +135,10 @@
<MultiBinding Converter="{x:Static wpf:RatingBar+PreviewIndicatorTransformYConverter.Instance}">
<Binding Path="ActualHeight" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding ElementName="previewValueVertical" Path="ActualHeight" />
<Binding Path="Orientation" RelativeSource="{RelativeSource FindAncestor, AncestorType=wpf:RatingBar}" />
<Binding Path="InvertDirection" RelativeSource="{RelativeSource FindAncestor, AncestorType=wpf:RatingBar}" />
<Binding Path="IsFractionalValueEnabled" RelativeSource="{RelativeSource FindAncestor, AncestorType=wpf:RatingBar}" />
<Binding Path="PreviewValue" RelativeSource="{RelativeSource FindAncestor, AncestorType=wpf:RatingBar}" />
<Binding Path="RatingBar.Orientation" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="RatingBar.InvertDirection" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="RatingBar.IsFractionalValueEnabled" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="RatingBar.PreviewValue" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="Value" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="IsMouseOver" RelativeSource="{RelativeSource TemplatedParent}" />
</MultiBinding>
Expand Down Expand Up @@ -243,9 +243,9 @@
<TextBlock.Foreground>
<MultiBinding Converter="{x:Static wpf:RatingBar+TextBlockForegroundConverter.Instance}">
<Binding Path="Tag" RelativeSource="{RelativeSource Self}" />
<Binding Path="Orientation" RelativeSource="{RelativeSource FindAncestor, AncestorType=wpf:RatingBar}" />
<Binding Path="InvertDirection" RelativeSource="{RelativeSource FindAncestor, AncestorType=wpf:RatingBar}" />
<Binding Path="Value" RelativeSource="{RelativeSource FindAncestor, AncestorType=wpf:RatingBar}" />
<Binding Path="RatingBar.Orientation" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="RatingBar.InvertDirection" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="RatingBar.Value" RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="Value" RelativeSource="{RelativeSource TemplatedParent}" />
</MultiBinding>
</TextBlock.Foreground>
Expand Down

0 comments on commit 572eccc

Please sign in to comment.