From 2c748ca5d1b56195a59d632ce1b7327ecc163a44 Mon Sep 17 00:00:00 2001
From: SpoinkyNL <spoinky.nl@gmail.com>
Date: Thu, 2 Jun 2016 00:45:28 +0200
Subject: [PATCH] Enabled pulse on profile editor glow effect and fixed slide
 animations

---
 .../Utilities/Layers/AnimationUpdater.cs        |  2 ++
 .../Profiles/ProfileEditorViewModel.cs          |  1 +
 .../ViewModels/Profiles/ProfileViewModel.cs     | 17 +++++++++++++++++
 .../Views/Profiles/ProfileEditorView.xaml       |  3 +--
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/Artemis/Artemis/Utilities/Layers/AnimationUpdater.cs b/Artemis/Artemis/Utilities/Layers/AnimationUpdater.cs
index f8aec7372..672c2bb9f 100644
--- a/Artemis/Artemis/Utilities/Layers/AnimationUpdater.cs
+++ b/Artemis/Artemis/Utilities/Layers/AnimationUpdater.cs
@@ -17,11 +17,13 @@ namespace Artemis.Utilities.Layers
                 case LayerAnimation.SlideLeft:
                     if (progress + 1 >= animateProperties.Width*scale)
                         progress = 0;
+                    progress = progress + animateProperties.AnimationSpeed * 2;
                     break;
                 case LayerAnimation.SlideDown:
                 case LayerAnimation.SlideUp:
                     if (progress + 1 >= animateProperties.Height*scale)
                         progress = 0;
+                    progress = progress + animateProperties.AnimationSpeed * 2;
                     break;
                 case LayerAnimation.Pulse:
                     if (progress > 2)
diff --git a/Artemis/Artemis/ViewModels/Profiles/ProfileEditorViewModel.cs b/Artemis/Artemis/ViewModels/Profiles/ProfileEditorViewModel.cs
index 0be32bfd5..6425e5b28 100644
--- a/Artemis/Artemis/ViewModels/Profiles/ProfileEditorViewModel.cs
+++ b/Artemis/Artemis/ViewModels/Profiles/ProfileEditorViewModel.cs
@@ -608,6 +608,7 @@ namespace Artemis.ViewModels.Profiles
                     return;
 
                 profile.KeyboardName = _mainManager.DeviceManager.ActiveKeyboard.Name;
+                profile.IsDefault = false;
                 profile.FixBoundaries(_mainManager.DeviceManager.ActiveKeyboard.KeyboardRectangle(1));
             }
 
diff --git a/Artemis/Artemis/ViewModels/Profiles/ProfileViewModel.cs b/Artemis/Artemis/ViewModels/Profiles/ProfileViewModel.cs
index 25c2c1668..fefeb2be1 100644
--- a/Artemis/Artemis/ViewModels/Profiles/ProfileViewModel.cs
+++ b/Artemis/Artemis/ViewModels/Profiles/ProfileViewModel.cs
@@ -19,6 +19,8 @@ namespace Artemis.ViewModels.Profiles
     public class ProfileViewModel : PropertyChangedBase, IHandle<ActiveKeyboardChanged>
     {
         private readonly DeviceManager _deviceManager;
+        private double _blurProgress;
+        private double _blurRadius;
         private DateTime _downTime;
         private LayerModel _draggingLayer;
         private Point? _draggingLayerOffset;
@@ -61,6 +63,16 @@ namespace Artemis.ViewModels.Profiles
             }
         }
 
+        public double BlurRadius
+        {
+            get { return _blurRadius; }
+            set
+            {
+                if (value.Equals(_blurRadius)) return;
+                _blurRadius = value;
+                NotifyOfPropertyChange(() => BlurRadius);
+            }
+        }
 
         public ImageSource KeyboardImage
         {
@@ -98,6 +110,11 @@ namespace Artemis.ViewModels.Profiles
         /// </summary>
         public void UpdateKeyboardPreview()
         {
+            if (_blurProgress > 2)
+                _blurProgress = 0;
+            _blurProgress = _blurProgress + 0.025;
+            BlurRadius = (Math.Sin(_blurProgress*Math.PI) + 1)*10 + 10;
+
             if (SelectedProfile == null || _deviceManager.ActiveKeyboard == null)
             {
                 KeyboardPreview = new DrawingImage();
diff --git a/Artemis/Artemis/Views/Profiles/ProfileEditorView.xaml b/Artemis/Artemis/Views/Profiles/ProfileEditorView.xaml
index 6409f06a1..3a438845f 100644
--- a/Artemis/Artemis/Views/Profiles/ProfileEditorView.xaml
+++ b/Artemis/Artemis/Views/Profiles/ProfileEditorView.xaml
@@ -30,9 +30,8 @@
         BorderThickness="3" Width="800" Height="400">
             <Border>
                 <Border.Effect>
-                    <!-- TODO: Pulse 10-20 -->
                     <DropShadowEffect ShadowDepth="0" Color="{DynamicResource HighlightColor}" Opacity="1"
-                                      BlurRadius="20" />
+                                      BlurRadius="{Binding Path=ProfileViewModel.BlurRadius, Mode=OneWay}" />
                 </Border.Effect>
                 <Grid>
                     <Image Grid.Column="0" Grid.Row="0" Source="{Binding Path=ProfileViewModel.KeyboardImage}" Margin="50" />