ripple-roo

Author: ButchersBoy

MaterialDesignColors.WpfExample/MainWindow.xaml

@@ -154,9 +154,10 @@
 			<RadioButton Style="{StaticResource MaterialDesignRadioButton}" x:Name="FieldsRadioButton" Margin="8 0 0 0" VerticalAlignment="Center">Fields</RadioButton>
             <Button Click="ProgressButton_OnClick" Margin="48 0 0 0">PROGRESS</Button>
 		</StackPanel>
-		<wpfExample:Buttons Visibility="{Binding ElementName=ButtonsRadioButton, Path=IsChecked, Converter={StaticResource BooleanToVisibilityConverter}}" />	
-		<wpfExample:TextFields Visibility="{Binding ElementName=FieldsRadioButton, Path=IsChecked, Converter={StaticResource BooleanToVisibilityConverter}}" />
-        
+		<wpfExample:Buttons Visibility="{Binding ElementName=ButtonsRadioButton, Path=IsChecked, Converter={StaticResource BooleanToVisibilityConverter}}" />
+        <ScrollViewer Visibility="{Binding ElementName=FieldsRadioButton, Path=IsChecked, Converter={StaticResource BooleanToVisibilityConverter}}">
+            <wpfExample:TextFields />    
+        </ScrollViewer>
 	</DockPanel>
 
 </Window>

MaterialDesignColors.WpfExample/ProgressWindow.xaml

@@ -2,7 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"        
         Background="{DynamicResource MaterialDesignPaper}"
         mc:Ignorable="d"
         Title="Progress Indicators" Height="300" Width="600" Left="40" Top="40">

MaterialDesignColors.WpfExample/TextFields.xaml

@@ -34,7 +34,7 @@
 			</Style>
 		</ResourceDictionary>
 	</UserControl.Resources>
-	<Grid Margin="16">
+	<Grid Margin="16" VerticalAlignment="Top">
 		<Grid.ColumnDefinitions>
 			<ColumnDefinition Width="Auto" />
 			<ColumnDefinition Width="150" />
@@ -78,6 +78,7 @@
 			<ComboBoxItem>Windows</ComboBoxItem>
 		</ComboBox>
         <TextBox Grid.Row="0" Grid.RowSpan="3" Grid.Column="4" TextWrapping="Wrap" VerticalAlignment="Stretch" Margin="16 0 0 0"
+                 MinWidth="280"
                  wpf:TextFieldAssist.Hint="Multiline text">Multiline.  Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</TextBox>
         <Viewbox Grid.Row="1" Grid.Column="0">
 			<Canvas Width="24" Height="24">

MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj

@@ -228,8 +228,8 @@
     <Compile Include="Converters\TextFieldHintVisibilityConverter.cs" />
     <Compile Include="TimePicker.cs" />
     <Compile Include="ToolTipAssist.cs" />
-    <Compile Include="VisualFeedbackAssist.cs" />
-    <Compile Include="VisualFeedbackContentControl.cs" />
+    <Compile Include="RippleAssist.cs" />
+    <Compile Include="Ripple.cs" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>

MaterialDesignThemes.Wpf/VisualFeedbackContentControl.cs renamed to MaterialDesignThemes.Wpf/Ripple.cs

@@ -15,14 +15,14 @@
 
 namespace MaterialDesignThemes.Wpf
 {    
-    public class VisualFeedbackContentControl : ContentControl
+    public class Ripple : ContentControl
     {
-        static VisualFeedbackContentControl()
+        static Ripple()
         {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(VisualFeedbackContentControl), new FrameworkPropertyMetadata(typeof(VisualFeedbackContentControl)));
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(Ripple), new FrameworkPropertyMetadata(typeof(Ripple)));
         }
 
-        public VisualFeedbackContentControl()
+        public Ripple()
         {   
             MouseMove += OnMouseMove;                        
         }
@@ -44,7 +44,7 @@ private void OnMouseMove(object sender, MouseEventArgs mouseEventArgs)
         }
 
         public static readonly DependencyProperty FeedbackProperty = DependencyProperty.Register(
-            "Feedback", typeof (Brush), typeof (VisualFeedbackContentControl), new PropertyMetadata(default(Brush)));
+            "Feedback", typeof (Brush), typeof (Ripple), new PropertyMetadata(default(Brush)));
 
         public Brush Feedback
         {
@@ -54,7 +54,7 @@ public Brush Feedback
 
         private static readonly DependencyPropertyKey MouseXPropertyKey =
             DependencyProperty.RegisterReadOnly(
-                "MouseX", typeof (double), typeof (VisualFeedbackContentControl),
+                "MouseX", typeof (double), typeof (Ripple),
                 new PropertyMetadata(default(double)));
 
         public static readonly DependencyProperty MouseXProperty =
@@ -68,7 +68,7 @@ public double MouseX
 
         private static readonly DependencyPropertyKey MouseYPropertyKey =
             DependencyProperty.RegisterReadOnly(
-                "MouseY", typeof (double), typeof (VisualFeedbackContentControl),
+                "MouseY", typeof (double), typeof (Ripple),
                 new PropertyMetadata(default(double)));
 
         public static readonly DependencyProperty MouseYProperty =
@@ -82,7 +82,7 @@ public double MouseY
 
         private static readonly DependencyPropertyKey MouseLeftButtonDownXPropertyKey =
             DependencyProperty.RegisterReadOnly(
-                "MouseLeftButtonDownX", typeof (double), typeof (VisualFeedbackContentControl),
+                "MouseLeftButtonDownX", typeof (double), typeof (Ripple),
                 new PropertyMetadata(default(double)));
 
         public static readonly DependencyProperty MouseLeftButtonDownXProperty =
@@ -96,7 +96,7 @@ public double MouseLeftButtonDownX
 
         private static readonly DependencyPropertyKey MouseLeftButtonDownYPropertyKey =
             DependencyProperty.RegisterReadOnly(
-                "MouseLeftButtonDownY", typeof (double), typeof (VisualFeedbackContentControl),
+                "MouseLeftButtonDownY", typeof (double), typeof (Ripple),
                 new PropertyMetadata(default(double)));
 
         public static readonly DependencyProperty MouseLeftButtonDownYProperty =

MaterialDesignThemes.Wpf/VisualFeedbackAssist.cs renamed to MaterialDesignThemes.Wpf/RippleAssist.cs

@@ -2,10 +2,10 @@
 
 namespace MaterialDesignThemes.Wpf
 {
-    public static class VisualFeedbackAssist
+    public static class RippleAssist
     {
         public static readonly DependencyProperty ClipToBoundsProperty = DependencyProperty.RegisterAttached(
-            "ClipToBounds", typeof (bool), typeof (VisualFeedbackAssist), new FrameworkPropertyMetadata(true, FrameworkPropertyMetadataOptions.Inherits));
+            "ClipToBounds", typeof (bool), typeof (RippleAssist), new FrameworkPropertyMetadata(true, FrameworkPropertyMetadataOptions.Inherits));
 
         public static void SetClipToBounds(DependencyObject element, bool value)
         {

MaterialDesignThemes.Wpf/Themes/Generic.xaml

@@ -24,16 +24,16 @@
 
 	<converters:BrushToRadialGradientBrushConverter x:Key="BrushToRadialGradientBrushConverter" />
 
-    <Style TargetType="{x:Type local:VisualFeedbackContentControl}">
+    <Style TargetType="{x:Type local:Ripple}">
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="VerticalAlignment" Value="Stretch" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="ClipToBounds" Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:VisualFeedbackAssist.ClipToBounds)}" />
+        <Setter Property="ClipToBounds" Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:RippleAssist.ClipToBounds)}" />
         <Setter Property="Feedback" Value="{Binding RelativeSource={RelativeSource Self}, Path=Foreground}" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:VisualFeedbackContentControl}">
+                <ControlTemplate TargetType="{x:Type local:Ripple}">
 					<Grid Background="Transparent">
 						<Canvas IsHitTestVisible="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                             <Ellipse x:Name="ClickEllipse" Fill="{TemplateBinding Feedback}" Opacity="0" Width="0" Height="0" Canvas.Left="{TemplateBinding MouseLeftButtonDownX}" Canvas.Top="{TemplateBinding MouseLeftButtonDownY}"