Layer properties - Added drag-editing for number-based properties

Layer properties - Added min and max values
Nuget - Updated Stylet to 1.3.1

src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/PropertyTimelineViewModel.cs

@@ -2,14 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Shapes;
-using Artemis.Core.Models.Surface;
 using Artemis.UI.Ninject.Factories;
-using Artemis.UI.Screens.SurfaceEditor;
-using Artemis.UI.Screens.SurfaceEditor.Visualization;
 using Artemis.UI.Services.Interfaces;
 using Stylet;
 
@@ -99,9 +95,37 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
             UpdateEndTime();
         }
 
+        #region Keyframe movement
+
+        public void MoveSelectedKeyframes(TimeSpan offset)
+        {
+            var keyframeViewModels = PropertyTrackViewModels.SelectMany(t => t.KeyframeViewModels.OrderBy(k => k.Keyframe.Position)).ToList();
+            foreach (var keyframeViewModel in keyframeViewModels.Where(k => k.IsSelected))
+            {
+                // TODO: Not ideal as this stacks them all if they get to 0, oh well
+                if (keyframeViewModel.Keyframe.Position + offset > TimeSpan.Zero)
+                {
+                    keyframeViewModel.Keyframe.Position += offset;
+                    keyframeViewModel.Update(LayerPropertiesViewModel.PixelsPerSecond);
+                }
+            }
+
+            _profileEditorService.UpdateProfilePreview();
+        }
+
+        #endregion
+
+        private void CreateViewModels(LayerPropertyViewModel property)
+        {
+            PropertyTrackViewModels.Add(_propertyTrackVmFactory.Create(this, property));
+            foreach (var child in property.Children)
+                CreateViewModels(child);
+        }
+
         #region Keyframe selection
 
         private Point _mouseDragStartPoint;
+        private bool _mouseDragging;
 
         // ReSharper disable once UnusedMember.Global - Called from view
         public void TimelineCanvasMouseDown(object sender, MouseButtonEventArgs e)
@@ -110,12 +134,17 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
 
             SelectionRectangle.Rect = new Rect();
             _mouseDragStartPoint = e.GetPosition((IInputElement) sender);
+            _mouseDragging = true;
+            e.Handled = true;
         }
 
         // ReSharper disable once UnusedMember.Global - Called from view
         public void TimelineCanvasMouseUp(object sender, MouseEventArgs e)
         {
-            var position = e.GetPosition((IInputElement)sender);
+            if (!_mouseDragging)
+                return;
+
+            var position = e.GetPosition((IInputElement) sender);
             var selectedRect = new Rect(_mouseDragStartPoint, position);
             SelectionRectangle.Rect = selectedRect;
 
@@ -130,21 +159,24 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
                 return HitTestFilterBehavior.Continue;
             });
             VisualTreeHelper.HitTest((Visual) sender, filterCallback, resultCallback, hitTestParams);
-            
+
             var keyframeViewModels = PropertyTrackViewModels.SelectMany(t => t.KeyframeViewModels.OrderBy(k => k.Keyframe.Position)).ToList();
             foreach (var keyframeViewModel in keyframeViewModels)
                 keyframeViewModel.IsSelected = selectedKeyframes.Contains(keyframeViewModel);
 
+            _mouseDragging = false;
+            e.Handled = true;
             ((IInputElement) sender).ReleaseMouseCapture();
         }
 
         public void TimelineCanvasMouseMove(object sender, MouseEventArgs e)
         {
-            if (e.LeftButton == MouseButtonState.Pressed)
+            if (_mouseDragging && e.LeftButton == MouseButtonState.Pressed)
             {
                 var position = e.GetPosition((IInputElement) sender);
                 var selectedRect = new Rect(_mouseDragStartPoint, position);
                 SelectionRectangle.Rect = selectedRect;
+                e.Handled = true;
             }
         }
 
@@ -191,32 +223,5 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
         }
 
         #endregion
-
-        #region Keyframe movement
-
-        public void MoveSelectedKeyframes(TimeSpan offset)
-        {
-            var keyframeViewModels = PropertyTrackViewModels.SelectMany(t => t.KeyframeViewModels.OrderBy(k => k.Keyframe.Position)).ToList();
-            foreach (var keyframeViewModel in keyframeViewModels.Where(k => k.IsSelected))
-            {
-                // TODO: Not ideal as this stacks them all if they get to 0, oh well
-                if (keyframeViewModel.Keyframe.Position + offset > TimeSpan.Zero)
-                {
-                    keyframeViewModel.Keyframe.Position += offset;
-                    keyframeViewModel.Update(LayerPropertiesViewModel.PixelsPerSecond);
-                }
-            }
-
-            _profileEditorService.UpdateProfilePreview();
-        }
-
-        #endregion
-
-        private void CreateViewModels(LayerPropertyViewModel property)
-        {
-            PropertyTrackViewModels.Add(_propertyTrackVmFactory.Create(this, property));
-            foreach (var child in property.Children)
-                CreateViewModels(child);
-        }
     }
 }

src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/PropertyTrackKeyframeViewModel.cs

@@ -48,6 +48,8 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
         {
             if (e.LeftButton == MouseButtonState.Released)
                 return;
+
+            ((IInputElement)sender).CaptureMouse();
             if (Keyboard.IsKeyDown(Key.LeftShift) || Keyboard.IsKeyDown(Key.RightShift) && !IsSelected)
                 PropertyTrackViewModel.PropertyTimelineViewModel.SelectKeyframe(this, true, false);
             else if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
@@ -55,16 +57,14 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
             else if (!IsSelected)
                 PropertyTrackViewModel.PropertyTimelineViewModel.SelectKeyframe(this, false, false);
 
-            ((IInputElement) sender).CaptureMouse();
             e.Handled = true;
         }
 
         public void KeyframeMouseUp(object sender, MouseButtonEventArgs e)
         {
-            if (e.LeftButton == MouseButtonState.Released)
-                return;
-            ((IInputElement) sender).ReleaseMouseCapture();
             _profileEditorService.UpdateSelectedProfileElement();
+
+            ((IInputElement)sender).ReleaseMouseCapture();
             e.Handled = true;
         }
 
@@ -95,6 +95,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
 
                 PropertyTrackViewModel.PropertyTimelineViewModel.MoveSelectedKeyframes(newTime - Keyframe.Position);
             }
+
             e.Handled = true;
         }
 

src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/PropertyTrackView.xaml

@@ -46,14 +46,14 @@
                                         <DataTrigger.EnterActions>
                                             <BeginStoryboard>
                                                 <Storyboard>
-                                                    <DoubleAnimation Storyboard.TargetProperty="StrokeThickness" To="1" Duration="0:0:0.25"></DoubleAnimation>
+                                                    <DoubleAnimation Storyboard.TargetProperty="StrokeThickness" To="1" Duration="0:0:0.25" />
                                                 </Storyboard>
                                             </BeginStoryboard>
                                         </DataTrigger.EnterActions>
                                         <DataTrigger.ExitActions>
                                             <BeginStoryboard>
                                                 <Storyboard>
-                                                    <DoubleAnimation Storyboard.TargetProperty="StrokeThickness" To="0" Duration="0:0:0.25"></DoubleAnimation>
+                                                    <DoubleAnimation Storyboard.TargetProperty="StrokeThickness" To="0" Duration="0:0:0.25" />
                                                 </Storyboard>
                                             </BeginStoryboard>
                                         </DataTrigger.ExitActions>