Skip to content

Commit 92ece53

Browse files
nicolaihenriksennicolaihenriksen
authored
Replace explicit AdornerDecorator.CacheMode with AP binding (#3587)
1 parent 72ec283 commit 92ece53

File tree

3 files changed

+12
-48
lines changed

3 files changed

+12
-48
lines changed

‎src/MaterialDesignThemes.Wpf/Themes/MaterialDesign3.Slider.xaml

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,7 @@
9191
<ScaleTransform ScaleX="0" ScaleY="0" />
9292
</Ellipse.RenderTransform>
9393
</Ellipse>
94-
<AdornerDecorator>
95-
<AdornerDecorator.CacheMode>
96-
<BitmapCache SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
97-
</AdornerDecorator.CacheMode>
94+
<AdornerDecorator CacheMode="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:ShadowAssist.CacheMode)}">
9895
<Ellipse x:Name="grip"
9996
Margin="-1,0"
10097
Effect="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=RangeBase}, Path=(wpf:ElevationAssist.Elevation), Converter={x:Static converters:ShadowConverter.Instance}}"
@@ -280,10 +277,7 @@
280277
<TranslateTransform X="{Binding ActualWidth, ElementName=label, Converter={StaticResource SliderValueLabelPositionConverter}, ConverterParameter={x:Static Orientation.Horizontal}}" Y="-40" />
281278
</TransformGroup>
282279
</Grid.RenderTransform>
283-
<AdornerDecorator>
284-
<AdornerDecorator.CacheMode>
285-
<BitmapCache SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
286-
</AdornerDecorator.CacheMode>
280+
<AdornerDecorator CacheMode="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:ShadowAssist.CacheMode)}">
287281
<Grid Effect="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=RangeBase}, Path=(wpf:ElevationAssist.Elevation), Converter={x:Static converters:ShadowConverter.Instance}}">
288282
<Rectangle Margin="0,0,0,5"
289283
Fill="{DynamicResource MaterialDesign.Brush.ToolTip.Background}"
@@ -314,10 +308,7 @@
314308
</TextBlock>
315309
</Grid>
316310
</Canvas>
317-
<AdornerDecorator>
318-
<AdornerDecorator.CacheMode>
319-
<BitmapCache SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
320-
</AdornerDecorator.CacheMode>
311+
<AdornerDecorator CacheMode="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:ShadowAssist.CacheMode)}">
321312
<Ellipse x:Name="grip"
322313
Margin="-1,0"
323314
Effect="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=RangeBase}, Path=(wpf:ElevationAssist.Elevation), Converter={x:Static converters:ShadowConverter.Instance}}"
@@ -498,10 +489,7 @@
498489
<TranslateTransform X="{Binding ActualWidth, ElementName=label, Converter={StaticResource SliderValueLabelPositionConverter}, ConverterParameter={x:Static Orientation.Vertical}}" Y="-7" />
499490
</TransformGroup>
500491
</Grid.RenderTransform>
501-
<AdornerDecorator>
502-
<AdornerDecorator.CacheMode>
503-
<BitmapCache SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
504-
</AdornerDecorator.CacheMode>
492+
<AdornerDecorator CacheMode="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:ShadowAssist.CacheMode)}">
505493
<Grid Effect="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=RangeBase}, Path=(wpf:ElevationAssist.Elevation), Converter={x:Static converters:ShadowConverter.Instance}}">
506494
<Rectangle Margin="0,0,5,0"
507495
Fill="{DynamicResource MaterialDesign.Brush.ToolTip.Background}"
@@ -532,10 +520,7 @@
532520
</TextBlock>
533521
</Grid>
534522
</Canvas>
535-
<AdornerDecorator>
536-
<AdornerDecorator.CacheMode>
537-
<BitmapCache SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
538-
</AdornerDecorator.CacheMode>
523+
<AdornerDecorator CacheMode="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:ShadowAssist.CacheMode)}">
539524
<Ellipse x:Name="grip"
540525
Margin="0,-1"
541526
Effect="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=RangeBase}, Path=(wpf:ElevationAssist.Elevation), Converter={x:Static converters:ShadowConverter.Instance}}"

‎src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.RatingBar.xaml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,7 @@
9393
</TranslateTransform>
9494
</TransformGroup>
9595
</Grid.RenderTransform>
96-
<AdornerDecorator>
97-
<AdornerDecorator.CacheMode>
98-
<BitmapCache SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
99-
</AdornerDecorator.CacheMode>
96+
<AdornerDecorator CacheMode="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:ShadowAssist.CacheMode)}">
10097
<Grid Effect="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=wpf:RatingBar}, Path=(wpf:ElevationAssist.Elevation), Converter={x:Static converters:ShadowConverter.Instance}}">
10198
<Rectangle Margin="0,0,0,5"
10299
Fill="{DynamicResource MaterialDesign.Brush.ToolTip.Background}"
@@ -149,10 +146,7 @@
149146
</TranslateTransform>
150147
</TransformGroup>
151148
</Grid.RenderTransform>
152-
<AdornerDecorator>
153-
<AdornerDecorator.CacheMode>
154-
<BitmapCache SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
155-
</AdornerDecorator.CacheMode>
149+
<AdornerDecorator CacheMode="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:ShadowAssist.CacheMode)}">
156150
<Grid Effect="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=wpf:RatingBar}, Path=(wpf:ElevationAssist.Elevation), Converter={x:Static converters:ShadowConverter.Instance}}">
157151
<Rectangle Margin="0,0,5,0"
158152
Fill="{DynamicResource MaterialDesign.Brush.ToolTip.Background}"

‎src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Slider.xaml

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,7 @@
9191
<ScaleTransform ScaleX="0" ScaleY="0" />
9292
</Ellipse.RenderTransform>
9393
</Ellipse>
94-
<AdornerDecorator>
95-
<AdornerDecorator.CacheMode>
96-
<BitmapCache SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
97-
</AdornerDecorator.CacheMode>
94+
<AdornerDecorator CacheMode="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:ShadowAssist.CacheMode)}">
9895
<Ellipse x:Name="grip"
9996
Margin="-1,0"
10097
Effect="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=RangeBase}, Path=(wpf:ElevationAssist.Elevation), Converter={x:Static converters:ShadowConverter.Instance}}"
@@ -280,10 +277,7 @@
280277
<TranslateTransform X="{Binding ActualWidth, ElementName=label, Converter={StaticResource SliderValueLabelPositionConverter}, ConverterParameter={x:Static Orientation.Horizontal}}" Y="-40" />
281278
</TransformGroup>
282279
</Grid.RenderTransform>
283-
<AdornerDecorator>
284-
<AdornerDecorator.CacheMode>
285-
<BitmapCache SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
286-
</AdornerDecorator.CacheMode>
280+
<AdornerDecorator CacheMode="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:ShadowAssist.CacheMode)}">
287281
<Grid Effect="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=RangeBase}, Path=(wpf:ElevationAssist.Elevation), Converter={x:Static converters:ShadowConverter.Instance}}">
288282
<Rectangle Margin="0,0,0,5"
289283
Fill="{DynamicResource MaterialDesign.Brush.ToolTip.Background}"
@@ -314,10 +308,7 @@
314308
</TextBlock>
315309
</Grid>
316310
</Canvas>
317-
<AdornerDecorator>
318-
<AdornerDecorator.CacheMode>
319-
<BitmapCache SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
320-
</AdornerDecorator.CacheMode>
311+
<AdornerDecorator CacheMode="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:ShadowAssist.CacheMode)}">
321312
<Ellipse x:Name="grip"
322313
Margin="-1,0"
323314
Effect="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=RangeBase}, Path=(wpf:ElevationAssist.Elevation), Converter={x:Static converters:ShadowConverter.Instance}}"
@@ -498,10 +489,7 @@
498489
<TranslateTransform X="{Binding ActualWidth, ElementName=label, Converter={StaticResource SliderValueLabelPositionConverter}, ConverterParameter={x:Static Orientation.Vertical}}" Y="-7" />
499490
</TransformGroup>
500491
</Grid.RenderTransform>
501-
<AdornerDecorator>
502-
<AdornerDecorator.CacheMode>
503-
<BitmapCache SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
504-
</AdornerDecorator.CacheMode>
492+
<AdornerDecorator CacheMode="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:ShadowAssist.CacheMode)}">
505493
<Grid Effect="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=RangeBase}, Path=(wpf:ElevationAssist.Elevation), Converter={x:Static converters:ShadowConverter.Instance}}">
506494
<Rectangle Margin="0,0,5,0"
507495
Fill="{DynamicResource MaterialDesign.Brush.ToolTip.Background}"
@@ -532,10 +520,7 @@
532520
</TextBlock>
533521
</Grid>
534522
</Canvas>
535-
<AdornerDecorator>
536-
<AdornerDecorator.CacheMode>
537-
<BitmapCache SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
538-
</AdornerDecorator.CacheMode>
523+
<AdornerDecorator CacheMode="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:ShadowAssist.CacheMode)}">
539524
<Ellipse x:Name="grip"
540525
Margin="0,-1"
541526
Effect="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=RangeBase}, Path=(wpf:ElevationAssist.Elevation), Converter={x:Static converters:ShadowConverter.Instance}}"

0 commit comments

Comments
 (0)