Skip to content

Commit 70bdc25

Browse files
ButchersBoyButchersBoy
committed
fix UWP ripple merge f*** up and move WPF ripple inline with UWP ripple
1 parent d828115 commit 70bdc25

File tree

6 files changed

+113
-277
lines changed

6 files changed

+113
-277
lines changed

‎MainDemo.Uwp/MainPage.xaml

Lines changed: 1 addition & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -15,121 +15,7 @@
1515
>
1616

1717
<Page.Resources>
18-
<ResourceDictionary>
19-
<Style x:Key="ButtonStyle1" TargetType="Button">
20-
<Setter Property="Background" Value="{ThemeResource SystemControlBackgroundBaseLowBrush}"/>
21-
<Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}"/>
22-
<Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundTransparentBrush}"/>
23-
<Setter Property="BorderThickness" Value="{ThemeResource ButtonBorderThemeThickness}"/>
24-
<Setter Property="Padding" Value="8,4,8,4"/>
25-
<Setter Property="HorizontalAlignment" Value="Left"/>
26-
<Setter Property="VerticalAlignment" Value="Center"/>
27-
<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}"/>
28-
<Setter Property="FontWeight" Value="Normal"/>
29-
<Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}"/>
30-
<Setter Property="UseSystemFocusVisuals" Value="True"/>
31-
<Setter Property="Template">
32-
<Setter.Value>
33-
<ControlTemplate TargetType="Button">
34-
<Grid x:Name="RootGrid" Background="{TemplateBinding Background}">
35-
<VisualStateManager.VisualStateGroups>
36-
<VisualStateGroup x:Name="CommonStates">
37-
<VisualState x:Name="Normal">
38-
<Storyboard>
39-
<PointerUpThemeAnimation Storyboard.TargetName="RootGrid"/>
40-
</Storyboard>
41-
</VisualState>
42-
<VisualState x:Name="PointerOver">
43-
<Storyboard>
44-
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="BorderBrush" Storyboard.TargetName="ContentPresenter">
45-
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightBaseMediumLowBrush}"/>
46-
</ObjectAnimationUsingKeyFrames>
47-
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Foreground" Storyboard.TargetName="ContentPresenter">
48-
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightBaseHighBrush}"/>
49-
</ObjectAnimationUsingKeyFrames>
50-
<PointerUpThemeAnimation Storyboard.TargetName="RootGrid"/>
51-
</Storyboard>
52-
</VisualState>
53-
<VisualState x:Name="Pressed">
54-
<Storyboard>
55-
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Background" Storyboard.TargetName="RootGrid">
56-
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlBackgroundBaseMediumLowBrush}"/>
57-
</ObjectAnimationUsingKeyFrames>
58-
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="BorderBrush" Storyboard.TargetName="ContentPresenter">
59-
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightTransparentBrush}"/>
60-
</ObjectAnimationUsingKeyFrames>
61-
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Foreground" Storyboard.TargetName="ContentPresenter">
62-
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightBaseHighBrush}"/>
63-
</ObjectAnimationUsingKeyFrames>
64-
<PointerDownThemeAnimation Storyboard.TargetName="RootGrid"/>
65-
</Storyboard>
66-
</VisualState>
67-
<VisualState x:Name="Disabled">
68-
<Storyboard>
69-
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Background" Storyboard.TargetName="RootGrid">
70-
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlBackgroundBaseLowBrush}"/>
71-
</ObjectAnimationUsingKeyFrames>
72-
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Foreground" Storyboard.TargetName="ContentPresenter">
73-
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlDisabledBaseLowBrush}"/>
74-
</ObjectAnimationUsingKeyFrames>
75-
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="BorderBrush" Storyboard.TargetName="ContentPresenter">
76-
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlDisabledTransparentBrush}"/>
77-
</ObjectAnimationUsingKeyFrames>
78-
</Storyboard>
79-
</VisualState>
80-
</VisualStateGroup>
81-
</VisualStateManager.VisualStateGroups>
82-
<ContentPresenter x:Name="ContentPresenter" AutomationProperties.AccessibilityView="Raw" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTransitions="{TemplateBinding ContentTransitions}" Content="{TemplateBinding Content}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
83-
</Grid>
84-
</ControlTemplate>
85-
</Setter.Value>
86-
</Setter>
87-
</Style>
88-
<Style x:Key="RippleStyle1" TargetType="uwp:Ripple">
89-
<Setter Property="HorizontalAlignment" Value="Stretch" />
90-
<Setter Property="VerticalAlignment" Value="Stretch" />
91-
<Setter Property="Background" Value="Transparent" />
92-
<Setter Property="Feedback" Value="White" />
93-
<Setter Property="Template">
94-
<Setter.Value>
95-
<ControlTemplate TargetType="uwp:Ripple">
96-
<Grid Background="Transparent">
97-
<Canvas IsHitTestVisible="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
98-
<Ellipse x:Name="ClickEllipse" Fill="{TemplateBinding Feedback}" Opacity="1" Width="10" Height="10"
99-
<<<<<<< HEAD
100-
Canvas.Left="10"
101-
Canvas.Top="10"
102-
RenderTransformOrigin=".5,.5">
103-
<Ellipse.RenderTransform>
104-
<TransformGroup>
105-
<ScaleTransform />
106-
<SkewTransform/>
107-
<RotateTransform/>
108-
<TranslateTransform x:Name="TranslateTransform"/>
109-
</TransformGroup>
110-
=======
111-
Canvas.Left="20"
112-
Canvas.Top="10"
113-
RenderTransformOrigin=".5,.5">
114-
<Ellipse.RenderTransform>
115-
<TranslateTransform x:Name="TranslateTransform"/>
116-
>>>>>>> a27409f27850f2f66b86905963924270e29b69a7
117-
</Ellipse.RenderTransform>
118-
</Ellipse>
119-
</Canvas>
120-
<ContentPresenter Content="{TemplateBinding Content}"
121-
ContentTemplate="{TemplateBinding ContentTemplate}"
122-
Margin="{TemplateBinding Padding}"
123-
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
124-
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
125-
</Grid>
126-
127-
</ControlTemplate>
128-
</Setter.Value>
129-
</Setter>
130-
</Style>
131-
132-
18+
<ResourceDictionary>
13319

13420
</ResourceDictionary>
13521
</Page.Resources>
@@ -144,15 +30,6 @@
14430
<Button Margin="8 0 0 0" Width="100" Style="{StaticResource MaterialDesignRaisedDarkButton}">DARK</Button>
14531
<Button Margin="8 0 0 0" Width="100" Style="{StaticResource MaterialDesignRaisedAccentButton}">ACCENT</Button>
14632
</StackPanel>
147-
<<<<<<< HEAD
148-
<Button Style="{StaticResource ButtonStyle1}">Normal</Button>
149-
<Border Background="Black">
150-
<uwp:Ripple Padding="26" Style="{StaticResource RippleStyle1}">
151-
<TextBlock Foreground="White">Ballz</TextBlock>
152-
</uwp:Ripple>
153-
</Border>
154-
=======
155-
>>>>>>> a27409f27850f2f66b86905963924270e29b69a7
15633
</StackPanel>
15734
</Grid>
15835
</Page>

‎MainDemo.Uwp/project.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11555,7 +11555,7 @@
1155511555
]
1155611556
},
1155711557
"Microsoft.ApplicationInsights.WindowsApps/1.0.0": {
11558-
"sha512": "NvBQnFeiFd0O1QdBz06UGApD7zn7ztVi7qO18IsM3EjiXRNgfrEBXB+azNm8XqLY8xGFAqh3HAuSd/wHZMe0XA==",
11558+
"sha512": "fNCAjIwvbTV+G0dT14bgM5tptsqeSaKQaCrlq7QknOq1Xdm8ZmgsDYddMgXkvykyKLjWyU6fKuOpj6fsQJy+wQ==",
1155911559
"type": "Package",
1156011560
"files": [
1156111561
"_rels/.rels",

‎MaterialDesignThemes.Uwp/Ripple.cs

Lines changed: 1 addition & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
using System;
22
using System.Collections.Generic;
33
using System.ComponentModel;
4-
using System.Linq;
54
using System.Runtime.CompilerServices;
6-
using System.Runtime.InteropServices.WindowsRuntime;
7-
<<<<<<< HEAD
8-
=======
95
using Windows.Devices.Input;
10-
>>>>>>> a27409f27850f2f66b86905963924270e29b69a7
116
using Windows.UI.Xaml;
127
using Windows.UI.Xaml.Controls;
138
using Windows.UI.Xaml.Data;
@@ -21,28 +16,20 @@ namespace MaterialDesignThemes.Uwp
2116
[TemplateVisualState(GroupName = "CommonStates", Name = "Pressed")]
2217
public sealed class Ripple : ContentControl, INotifyPropertyChanged
2318
{
24-
<<<<<<< HEAD
25-
private double _pointerPressedY;
26-
private double _pointerPressedX;
27-
=======
2819
private double _rippleSize;
2920
private double _rippleX;
3021
private double _rippleY;
31-
>>>>>>> a27409f27850f2f66b86905963924270e29b69a7
3222

3323
public Ripple()
3424
{
3525
DefaultStyleKey = typeof(Ripple);
36-
<<<<<<< HEAD
37-
=======
3826
SizeChanged += OnSizeChanged;
3927
}
4028

4129
private void OnSizeChanged(object sender, SizeChangedEventArgs sizeChangedEventArgs)
4230
{
4331
RippleSize = Math.Max(sizeChangedEventArgs.NewSize.Width, sizeChangedEventArgs.NewSize.Height) * RippleSizeMultiplier;
44-
Clip = new RectangleGeometry() { Rect = new Windows.Foundation.Rect(0, 0, sizeChangedEventArgs.NewSize.Width, sizeChangedEventArgs.NewSize.Height) };
45-
>>>>>>> a27409f27850f2f66b86905963924270e29b69a7
32+
Clip = new RectangleGeometry { Rect = new Windows.Foundation.Rect(0, 0, sizeChangedEventArgs.NewSize.Width, sizeChangedEventArgs.NewSize.Height) };
4633
}
4734

4835
public static readonly DependencyProperty FeedbackProperty = DependencyProperty.Register(
@@ -63,13 +50,6 @@ protected override void OnApplyTemplate()
6350

6451
protected override void OnPointerPressed(PointerRoutedEventArgs e)
6552
{
66-
<<<<<<< HEAD
67-
var point = e.GetCurrentPoint(this);
68-
PointerPressedX = point.Position.X;
69-
PointerPressedY = point.Position.Y;
70-
71-
VisualStateManager.GoToState(this, "Pressed", false);
72-
=======
7353
if (e.Pointer.PointerDeviceType == PointerDeviceType.Mouse)
7454
{
7555
var point = e.GetCurrentPoint(this);
@@ -80,27 +60,10 @@ protected override void OnPointerPressed(PointerRoutedEventArgs e)
8060
VisualStateManager.GoToState(this, "Normal", true);
8161
VisualStateManager.GoToState(this, "MousePressed", true);
8262
}
83-
>>>>>>> a27409f27850f2f66b86905963924270e29b69a7
8463

8564
base.OnPointerPressed(e);
8665
}
8766

88-
<<<<<<< HEAD
89-
protected override void OnPointerReleased(PointerRoutedEventArgs e)
90-
{
91-
VisualStateManager.GoToState(this, "Normal", false);
92-
93-
base.OnPointerReleased(e);
94-
}
95-
96-
public double PointerPressedY
97-
{
98-
get { return _pointerPressedY; }
99-
private set
100-
{
101-
if (_pointerPressedY == value) return;
102-
_pointerPressedY = value;
103-
=======
10467
public static readonly DependencyProperty RippleSizeMultiplierProperty = DependencyProperty.Register(
10568
"RippleSizeMultiplier", typeof (double), typeof (Ripple), new PropertyMetadata(1.75));
10669

@@ -128,28 +91,17 @@ private set
12891
{
12992
if (_rippleY == value) return;
13093
_rippleY = value;
131-
>>>>>>> a27409f27850f2f66b86905963924270e29b69a7
13294
OnPropertyChanged();
13395
}
13496
}
13597

136-
<<<<<<< HEAD
137-
public double PointerPressedX
138-
{
139-
get { return _pointerPressedX; }
140-
private set
141-
{
142-
if (_pointerPressedX == value) return;
143-
_pointerPressedX = value;
144-
=======
14598
public double RippleX
14699
{
147100
get { return _rippleX; }
148101
private set
149102
{
150103
if (_rippleX == value) return;
151104
_rippleX = value;
152-
>>>>>>> a27409f27850f2f66b86905963924270e29b69a7
153105
OnPropertyChanged();
154106
}
155107
}

‎MaterialDesignThemes.Uwp/Themes/Generic.xaml

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,6 @@
2929
<Setter.Value>
3030
<ControlTemplate TargetType="local:Ripple">
3131
<Grid Background="Transparent">
32-
<<<<<<< HEAD
33-
<Canvas IsHitTestVisible="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
34-
<Ellipse x:Name="ClickEllipse" Fill="{TemplateBinding Feedback}" Opacity="1" Width="10" Height="10"
35-
Canvas.Left="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=PointerPressedX}"
36-
Canvas.Top="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=PointerPressedY}"
37-
RenderTransformOrigin=".5,.5">
38-
<Ellipse.RenderTransform>
39-
<TransformGroup>
40-
<ScaleTransform />
41-
=======
4232
<VisualStateManager.VisualStateGroups>
4333
<VisualStateGroup x:Name="CommonStates">
4434
<VisualStateGroup.Transitions>
@@ -83,8 +73,7 @@
8373
</DoubleAnimationUsingKeyFrames>
8474
<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="ScaleY" Storyboard.TargetName="ScaleTransform">
8575
<DiscreteDoubleKeyFrame KeyTime="0" Value="1" />
86-
</DoubleAnimationUsingKeyFrames>
87-
76+
</DoubleAnimationUsingKeyFrames>
8877
</Storyboard>
8978
</VisualState>
9079
</VisualStateGroup>
@@ -98,9 +87,7 @@
9887
RenderTransformOrigin=".5,.5">
9988
<Ellipse.RenderTransform>
10089
<TransformGroup>
101-
<ScaleTransform x:Name="ScaleTransform"
102-
/>
103-
>>>>>>> a27409f27850f2f66b86905963924270e29b69a7
90+
<ScaleTransform x:Name="ScaleTransform" />
10491
<SkewTransform/>
10592
<RotateTransform/>
10693
<TranslateTransform x:Name="TranslateTransform"/>

0 commit comments

Comments
 (0)