Fixed issues with material design for panel pc.

5 files changed, 72 insertions, 16 deletions

diff --git a/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/Ripple.cs b/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/Ripple.cs
index 9eba9a56e..1f8e6be6a 100644
--- a/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/Ripple.cs
+++ b/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/Ripple.cs
@@ -22,7 +22,7 @@ namespace MaterialDesignThemes.Wpf
         private static readonly HashSet<Ripple> PressedInstances = new HashSet<Ripple>();
 
         static Ripple()
-        {                        
+        {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(Ripple), new FrameworkPropertyMetadata(typeof(Ripple)));
 
             EventManager.RegisterClassHandler(typeof(ContentControl), Mouse.PreviewMouseUpEvent, new MouseButtonEventHandler(MouseButtonEventHandler), true);
@@ -32,9 +32,9 @@ namespace MaterialDesignThemes.Wpf
         }
 
         public Ripple()
-        {            
-            SizeChanged += OnSizeChanged;            
-        }        
+        {
+            SizeChanged += OnSizeChanged;
+        }
 
         private static void MouseButtonEventHandler(object sender, MouseButtonEventArgs e)
         {
@@ -54,7 +54,8 @@ namespace MaterialDesignThemes.Wpf
                         scaleXKeyFrame.KeyTime = KeyTime.FromTimeSpan(newTime);
                     }
                     var scaleYKeyFrame = ripple.Template.FindName("MousePressedToNormalScaleYKeyFrame", ripple) as EasingDoubleKeyFrame;
-                    if (scaleYKeyFrame != null) {
+                    if (scaleYKeyFrame != null)
+                    {
                         scaleYKeyFrame.KeyTime = KeyTime.FromTimeSpan(newTime);
                     }
                 }
@@ -64,6 +65,23 @@ namespace MaterialDesignThemes.Wpf
             PressedInstances.Clear();
         }
 
+        protected override void OnTouchLeave(TouchEventArgs e)
+        {
+            foreach (var ripple in PressedInstances.ToList())
+            {
+                var relativePosition = e.GetTouchPoint(ripple).Position;
+                if (relativePosition.X < 0
+                    || relativePosition.Y < 0
+                    || relativePosition.X >= ripple.ActualWidth
+                    || relativePosition.Y >= ripple.ActualHeight)
+
+                {
+                    VisualStateManager.GoToState(ripple, TemplateStateMouseOut, true);
+                    PressedInstances.Remove(ripple);
+                }
+            }
+        }
+
         private static void MouseMouveEventHandler(object sender, MouseEventArgs e)
         {
             foreach (var ripple in PressedInstances.ToList())
@@ -79,7 +97,7 @@ namespace MaterialDesignThemes.Wpf
                     PressedInstances.Remove(ripple);
                 }
             }
-        }        
+        }
 
         public static readonly DependencyProperty FeedbackProperty = DependencyProperty.Register(
             nameof(Feedback), typeof(Brush), typeof(Ripple), new PropertyMetadata(default(Brush)));
@@ -90,10 +108,48 @@ namespace MaterialDesignThemes.Wpf
             set { SetValue(FeedbackProperty, value); }
         }
 
+        protected override void OnPreviewTouchDown(TouchEventArgs e)
+        {
+            var point = e.GetTouchPoint(this);
+
+            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.Position.X - RippleSize / 2;
+                RippleY = point.Position.Y - RippleSize / 2;
+            }
+
+            if (!RippleAssist.GetIsDisabled(this))
+            {
+                VisualStateManager.GoToState(this, TemplateStateNormal, false);
+                VisualStateManager.GoToState(this, TemplateStateMousePressed, true);
+                PressedInstances.Add(this);
+            }
+
+            base.OnPreviewTouchDown(e);
+        }
+
         protected override void OnPreviewMouseLeftButtonDown(MouseButtonEventArgs e)
         {
             var point = e.GetPosition(this);
-            
+
             if (RippleAssist.GetIsCentered(this))
             {
                 var innerContent = (Content as FrameworkElement);
@@ -191,7 +247,7 @@ namespace MaterialDesignThemes.Wpf
         public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
-                        
+
             VisualStateManager.GoToState(this, TemplateStateNormal, false);
         }
 
diff --git a/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Defaults.xaml b/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Defaults.xaml
index 647547935..7c8859e8c 100644
--- a/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Defaults.xaml
+++ b/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Defaults.xaml
@@ -15,8 +15,8 @@
         <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.GridSplitter.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.GroupBox.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Hyperlink.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/materialdesigntheme.Label.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/materialdesigntheme.Listbox.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Label.xaml" />
+		<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ListBox.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Menu.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.PasswordBox.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ProgressBar.xaml" />
diff --git a/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ListBox.xaml b/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ListBox.xaml
index e36f04c43..ed3fb8b7f 100644
--- a/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ListBox.xaml
+++ b/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ListBox.xaml
@@ -167,8 +167,8 @@
                 <ControlTemplate TargetType="{x:Type ListBox}">
                     <ControlTemplate.Resources>
                         <Style TargetType="{x:Type wpf:PackIcon}" >
-                            <Setter Property="Width" Value="22" />
-                            <Setter Property="Height" Value="22" />
+							<Setter Property="wpf:PackIcon.Width" Value="22" />
+							<Setter Property="wpf:PackIcon.Height" Value="22" />
                         </Style>
                     </ControlTemplate.Resources>
                     <Border x:Name="Bd" 
diff --git a/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Menu.xaml b/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Menu.xaml
index e69c3bfa2..fde9bf994 100644
--- a/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Menu.xaml
+++ b/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Menu.xaml
@@ -81,8 +81,8 @@
                 <ControlTemplate TargetType="{x:Type MenuItem}">
                     <ControlTemplate.Resources>
                         <Style TargetType="{x:Type wpf:PackIcon}" >
-                            <Setter Property="Width" Value="16" />
-                            <Setter Property="Height" Value="16" />
+							<Setter Property="wpf:PackIcon.Width" Value="16" />
+							<Setter Property="wpf:PackIcon.Height" Value="16" />
                         </Style>
                     </ControlTemplate.Resources>
                     <Grid ClipToBounds="True">
diff --git a/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToolBar.xaml b/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToolBar.xaml
index 4c5360193..3a9ac6ec1 100644
--- a/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToolBar.xaml
+++ b/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToolBar.xaml
@@ -129,8 +129,8 @@
                 <ControlTemplate TargetType="{x:Type ToolBar}">
                     <ControlTemplate.Resources>
                         <Style TargetType="{x:Type wpf:PackIcon}" >
-                            <Setter Property="Width" Value="22" />
-                            <Setter Property="Height" Value="22" />
+							<Setter Property="wpf:PackIcon.Width" Value="22" />
+							<Setter Property="wpf:PackIcon.Height" Value="22" />
                         </Style>
                         <Style TargetType="ListBox" BasedOn="{StaticResource MaterialDesignToolToggleFlatListBox}">
                             <Setter Property="ItemContainerStyle">