merge stuff

Author: ButchersBoy

MainDemo.Wpf/Cards.xaml

@@ -39,15 +39,17 @@
                     <TextBlock TextWrapping="Wrap" VerticalAlignment="Center">A great way to keep fit and forget about the constant grind of IT.</TextBlock>
                 </StackPanel>
                 <StackPanel HorizontalAlignment="Right" Grid.Row="2" Orientation="Horizontal" Margin="8">
-                    <Button Style="{StaticResource MaterialDesignToolButton}" Width="30" Padding="2 0 2 0">
+                    <Button Style="{StaticResource MaterialDesignToolButton}" Width="30" Padding="2 0 2 0"
+                            wpf:RippleAssist.IsCentered="True">
                         <Viewbox Width="16" Height="16">
                             <Canvas Width="24" Height="24">
                                 <Path Data="M18,16.08C17.24,16.08 16.56,16.38 16.04,16.85L8.91,12.7C8.96,12.47 9,12.24 9,12C9,11.76 8.96,11.53 8.91,11.3L15.96,7.19C16.5,7.69 17.21,8 18,8A3,3 0 0,0 21,5A3,3 0 0,0 18,2A3,3 0 0,0 15,5C15,5.24 15.04,5.47 15.09,5.7L8.04,9.81C7.5,9.31 6.79,9 6,9A3,3 0 0,0 3,12A3,3 0 0,0 6,15C6.79,15 7.5,14.69 8.04,14.19L15.16,18.34C15.11,18.55 15.08,18.77 15.08,19C15.08,20.61 16.39,21.91 18,21.91C19.61,21.91 20.92,20.61 20.92,19A2.92,2.92 0 0,0 18,16.08Z" 
                                       Fill="{Binding RelativeSource={RelativeSource AncestorType={x:Type Button}}, Path=Foreground}" />
                             </Canvas>
                         </Viewbox>
                     </Button>
-                    <Button Style="{StaticResource MaterialDesignToolButton}" Width="30" Padding="2 0 2 0">
+                    <Button Style="{StaticResource MaterialDesignToolButton}" Width="30" Padding="2 0 2 0"
+                            wpf:RippleAssist.IsCentered="True">
                         <Viewbox Width="16" Height="16">
                             <Canvas Width="24" Height="24">
                                 <Path Data="M12,21.35L10.55,20.03C5.4,15.36 2,12.27 2,8.5C2,5.41 4.42,3 7.5,3C9.24,3 10.91,3.81 12,5.08C13.09,3.81 14.76,3 16.5,3C19.58,3 22,5.41 22,8.5C22,12.27 18.6,15.36 13.45,20.03L12,21.35Z" 

MainDemo.Wpf/ColorZones.xaml

@@ -6,7 +6,7 @@
              xmlns:local="clr-namespace:MaterialDesignColors.WpfExample"
              xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf;assembly=MaterialDesignThemes.Wpf"
              mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="300">
+             d:DesignHeight="800" d:DesignWidth="600">
     <ScrollViewer>
         <StackPanel Margin="16">
             <TextBlock FontSize="16">Colour Zones</TextBlock>
@@ -18,7 +18,8 @@
                         <ToggleButton Style="{DynamicResource MaterialDesignHamburgerToggleButton}" />
                         <TextBlock VerticalAlignment="Center" Margin="16 0 0 0">Material Design In XAML Toolkit</TextBlock>
                     </StackPanel>
-                    <Button Style="{DynamicResource MaterialDesignToolForegroundButton}" DockPanel.Dock="Right" HorizontalAlignment="Right">
+                    <Button Style="{DynamicResource MaterialDesignToolForegroundButton}" DockPanel.Dock="Right" HorizontalAlignment="Right"
+                            wpf:RippleAssist.IsCentered="True">
                         <Viewbox Width="16" Height="16">
                             <Canvas Width="24" Height="24">
                                 <Path Data="M2,21L23,12L2,3V10L17,12L2,14V21Z" Fill="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=Button}, Path=Foreground}" />
@@ -36,7 +37,8 @@
             </wpf:ColorZone>
             <TextBlock Margin="0 16 0 0" FontSize="10">Use primary mid colours, and nest colour zones!</TextBlock>
             <wpf:ColorZone Mode="PrimaryMid" Padding="16">
-                <StackPanel Orientation="Horizontal">
+                <StackPanel Orientation="Horizontal"
+                            wpf:RippleAssist.IsCentered="True">
                     <ToggleButton Style="{DynamicResource MaterialDesignHamburgerToggleButton}" />
                     <wpf:ColorZone Mode="Standard" Padding="8 4 8 4" CornerRadius="2" Panel.ZIndex="1"
                                    Margin="16 0 0 0"

MainDemo.Wpf/MainWindow.xaml.cs

@@ -11,5 +11,5 @@ public MainWindow()
         {
             InitializeComponent();
         }
-    }
+    } 
 }

MaterialDesignThemes.Wpf/Clock.cs

@@ -269,7 +269,7 @@ private void ClockItemDragDeltaHandler(object sender, DragDeltaEventArgs dragDel
             if (angle < 0) angle += 2 * Math.PI;
 
             var time = DisplayMode == ClockDisplayMode.Hours
-                ? new DateTime(Time.Year, Time.Month, Time.Day, (int)Math.Round(6 * angle / Math.PI, MidpointRounding.AwayFromZero) % 12, Time.Minute, Time.Second)
+                ? new DateTime(Time.Year, Time.Month, Time.Day, (int)Math.Round(6 * angle / Math.PI, MidpointRounding.AwayFromZero) % 12 + (IsPostMeridiem? 12 : 0), Time.Minute, Time.Second)
                 : new DateTime(Time.Year, Time.Month, Time.Day, Time.Hour, (int)Math.Round(30 * angle / Math.PI, MidpointRounding.AwayFromZero) % 60, Time.Second);
 
             SetCurrentValue(TimeProperty, time);	

MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj

@@ -221,7 +221,6 @@
     <Compile Include="DialogClosingEventArgs.cs" />
     <Compile Include="DialogClosingEventHandler.cs" />
     <Compile Include="DialogHost.cs" />
-    <Compile Include="Extensions.cs" />
     <Compile Include="ListSortDirectionIndicator.cs" />
     <Compile Include="MaterialDataGridComboBoxColumn.cs" />
     <Compile Include="MaterialDataGridTextColumn.cs" />
@@ -249,6 +248,7 @@
     <Compile Include="ToolTipAssist.cs" />
     <Compile Include="RippleAssist.cs" />
     <Compile Include="Ripple.cs" />
+    <Compile Include="Underline.cs" />
     <Compile Include="ValidationAssist.cs" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>

MaterialDesignThemes.Wpf/Ripple.cs

@@ -1,39 +1,61 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace MaterialDesignThemes.Wpf
 {
-    [TemplateVisualState(GroupName = "CommonStates", Name = "Normal")]
-    [TemplateVisualState(GroupName = "CommonStates", Name = "Pressed")]
+    [TemplateVisualState(GroupName = "CommonStates", Name = TemplateStateNormal)]
+    [TemplateVisualState(GroupName = "CommonStates", Name = TemplateStateMousePressed)]
+    [TemplateVisualState(GroupName = "CommonStates", Name = TemplateStateMouseOut)]
     public class Ripple : ContentControl
     {
+        public const string TemplateStateNormal = "Normal";
+        public const string TemplateStateMousePressed = "MousePressed";
+        public const string TemplateStateMouseOut = "MouseOut";
+
+        private static readonly HashSet<Ripple> PressedInstances = new HashSet<Ripple>();
+
         static Ripple()
-        {
+        {                        
             DefaultStyleKeyProperty.OverrideMetadata(typeof(Ripple), new FrameworkPropertyMetadata(typeof(Ripple)));
+
+            EventManager.RegisterClassHandler(typeof(Window), Mouse.PreviewMouseUpEvent, new MouseButtonEventHandler(MouseButtonEventHandler), true);
+            EventManager.RegisterClassHandler(typeof (Window), Mouse.MouseMoveEvent, new MouseEventHandler(MouseMouveEventHandler), true);
         }
 
         public Ripple()
-        {               
-            SizeChanged += OnSizeChanged;          
-        }
+        {            
+            SizeChanged += OnSizeChanged;            
+        }        
 
-        private void OnSizeChanged(object sender, SizeChangedEventArgs sizeChangedEventArgs)
+        private static void MouseButtonEventHandler(object sender, MouseButtonEventArgs e)
         {
-            RippleSize = Math.Max(sizeChangedEventArgs.NewSize.Width, sizeChangedEventArgs.NewSize.Height) * RippleSizeMultiplier;
+            foreach (var ripple in PressedInstances)
+                VisualStateManager.GoToState(ripple, TemplateStateNormal, false);
+            PressedInstances.Clear();
         }
 
+        private static void MouseMouveEventHandler(object sender, MouseEventArgs e)
+        {
+            foreach (var ripple in PressedInstances.ToList())
+            {
+                var relativePosition = Mouse.GetPosition(ripple);
+                if (relativePosition.X < 0
+                    || relativePosition.Y < 0
+                    || relativePosition.X >= ripple.ActualWidth
+                    || relativePosition.Y >= ripple.ActualHeight)
+
+                {
+                    VisualStateManager.GoToState(ripple, TemplateStateMouseOut, true);
+                    PressedInstances.Remove(ripple);
+                }
+            }
+        }        
+
         public static readonly DependencyProperty FeedbackProperty = DependencyProperty.Register(
             "Feedback", typeof(Brush), typeof(Ripple), new PropertyMetadata(default(Brush)));
 
@@ -46,25 +68,38 @@ public Brush Feedback
         protected override void OnPreviewMouseLeftButtonDown(MouseButtonEventArgs e)
         {
             var point = e.GetPosition(this);
-
-            RippleX = point.X - RippleSize / 2;
-            RippleY = point.Y - RippleSize / 2;
-
-            VisualStateManager.GoToState(this, "Normal", true);
-            VisualStateManager.GoToState(this, "MousePressed", true);            
+            
+            if (RippleAssist.GetIsCentered(this))
+            {
+                var innerContent = (Content as FrameworkElement);
+
+                if (innerContent != null)
+                {
+                    var position = innerContent.TransformToAncestor(this)
+                        .Transform(new Point(0, 0));
+
+                    RippleX = position.X + innerContent.ActualWidth / 2 - RippleSize / 2;
+                    RippleY = position.Y + innerContent.ActualHeight / 2 - RippleSize / 2;
+                }
+                else
+                {
+                    RippleX = ActualWidth / 2 - RippleSize / 2;
+                    RippleY = ActualHeight / 2 - RippleSize / 2;
+                }
+            }
+            else
+            {
+                RippleX = point.X - RippleSize / 2;
+                RippleY = point.Y - RippleSize / 2;
+            }
+
+            VisualStateManager.GoToState(this, TemplateStateNormal, false);
+            VisualStateManager.GoToState(this, TemplateStateMousePressed, true);
+            PressedInstances.Add(this);            
 
             base.OnPreviewMouseLeftButtonDown(e);
         }
 
-        public static readonly DependencyProperty RippleSizeMultiplierProperty = DependencyProperty.Register(
-            "RippleSizeMultiplier", typeof(double), typeof(Ripple), new PropertyMetadata(1.75));
-
-        public double RippleSizeMultiplier
-        {
-            get { return (double)GetValue(RippleSizeMultiplierProperty); }
-            set { SetValue(RippleSizeMultiplierProperty, value); }
-        }
-
         private static readonly DependencyPropertyKey RippleSizePropertyKey =
             DependencyProperty.RegisterReadOnly(
                 "RippleSize", typeof(double), typeof(Ripple),
@@ -81,30 +116,59 @@ public double RippleSize
 
         private static readonly DependencyPropertyKey RippleXPropertyKey =
             DependencyProperty.RegisterReadOnly(
-                "RippleX", typeof (double), typeof (Ripple),
+                "RippleX", typeof(double), typeof(Ripple),
                 new PropertyMetadata(default(double)));
 
         public static readonly DependencyProperty RippleXProperty =
             RippleXPropertyKey.DependencyProperty;
 
         public double RippleX
         {
-            get { return (double) GetValue(RippleXProperty); }
+            get { return (double)GetValue(RippleXProperty); }
             private set { SetValue(RippleXPropertyKey, value); }
         }
 
         private static readonly DependencyPropertyKey RippleYPropertyKey =
             DependencyProperty.RegisterReadOnly(
-                "RippleY", typeof (double), typeof (Ripple),
+                "RippleY", typeof(double), typeof(Ripple),
                 new PropertyMetadata(default(double)));
 
         public static readonly DependencyProperty RippleYProperty =
             RippleYPropertyKey.DependencyProperty;
 
         public double RippleY
         {
-            get { return (double) GetValue(RippleYProperty); }
+            get { return (double)GetValue(RippleYProperty); }
             private set { SetValue(RippleYPropertyKey, value); }
-        }                                
+        }       
+
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+                        
+            VisualStateManager.GoToState(this, TemplateStateNormal, false);
+        }
+
+        private void OnSizeChanged(object sender, SizeChangedEventArgs sizeChangedEventArgs)
+        {
+            var innerContent = (Content as FrameworkElement);
+
+            double width, height;
+
+            if (RippleAssist.GetIsCentered(this) && innerContent != null)
+            {
+                width = innerContent.ActualWidth;
+                height = innerContent.ActualHeight;
+            }
+            else
+            {
+                width = sizeChangedEventArgs.NewSize.Width;
+                height = sizeChangedEventArgs.NewSize.Height;
+            }
+
+            var radius = Math.Sqrt(Math.Pow(width, 2) + Math.Pow(height, 2));
+
+            RippleSize = 2 * radius * RippleAssist.GetRippleSizeMultiplier(this);
+        }
     }
 }

MaterialDesignThemes.Wpf/RippleAssist.cs

@@ -4,6 +4,8 @@ namespace MaterialDesignThemes.Wpf
 {
     public static class RippleAssist
     {
+        #region ClipToBound
+
         public static readonly DependencyProperty ClipToBoundsProperty = DependencyProperty.RegisterAttached(
             "ClipToBounds", typeof (bool), typeof (RippleAssist), new FrameworkPropertyMetadata(true, FrameworkPropertyMetadataOptions.Inherits));
 
@@ -15,6 +17,43 @@ public static void SetClipToBounds(DependencyObject element, bool value)
         public static bool GetClipToBounds(DependencyObject element)
         {
             return (bool) element.GetValue(ClipToBoundsProperty);
-        }   
+        }
+
+        #endregion
+
+        #region StayOnCenter
+
+        public static readonly DependencyProperty IsCenteredProperty = DependencyProperty.RegisterAttached(
+            "IsCentered", typeof(bool), typeof(RippleAssist), new FrameworkPropertyMetadata(false, FrameworkPropertyMetadataOptions.Inherits));
+
+        public static void SetIsCentered(DependencyObject element, bool value)
+        {
+            element.SetValue(IsCenteredProperty, value);
+        }
+
+        public static bool GetIsCentered(DependencyObject element)
+        {
+            return (bool)element.GetValue(IsCenteredProperty);
+        }
+
+        #endregion
+
+        #region RippleSizeMultiplier
+
+        public static readonly DependencyProperty RippleSizeMultiplierProperty = DependencyProperty.RegisterAttached(
+            "RippleSizeMultiplier", typeof(double), typeof(RippleAssist), new FrameworkPropertyMetadata(1.0, FrameworkPropertyMetadataOptions.Inherits));
+
+        public static void SetRippleSizeMultiplier(DependencyObject element, double value)
+        {
+            element.SetValue(RippleSizeMultiplierProperty, value);
+        }
+
+        public static double GetRippleSizeMultiplier(DependencyObject element)
+        {
+            return (double)element.GetValue(RippleSizeMultiplierProperty);
+        }
+
+        #endregion
+
     }
 }