From 61a5cd09a647e92d744d8580f972daa6319e9af2 Mon Sep 17 00:00:00 2001
From: Robert <mail@rbeekman.nl>
Date: Tue, 6 Oct 2020 19:45:30 +0200
Subject: [PATCH] Effects - Fixed post processing effects not being applied

Property tree - Fixed drag and drop interfering with property dragging
---
 src/Artemis.Core/Models/Profile/Layer.cs                 | 4 ++--
 .../LayerProperties/Tree/TreeGroupView.xaml              | 3 ++-
 .../ProfileEditor/LayerProperties/Tree/TreeViewModel.cs  | 9 +++------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/Artemis.Core/Models/Profile/Layer.cs b/src/Artemis.Core/Models/Profile/Layer.cs
index 45c973df9..8e0e66ab2 100644
--- a/src/Artemis.Core/Models/Profile/Layer.cs
+++ b/src/Artemis.Core/Models/Profile/Layer.cs
@@ -388,14 +388,14 @@ namespace Artemis.Core
             else if (General.ResizeMode.CurrentValue == LayerResizeMode.Clip)
                 ClipRender(layerCanvas, _layerBitmap.Info, layerPaint, layerPath);
 
+            using SKPaint canvasPaint = new SKPaint { BlendMode = General.BlendMode.CurrentValue };
             foreach (BaseLayerEffect baseLayerEffect in LayerEffects.Where(e => e.Enabled))
-                baseLayerEffect.PostProcess(layerCanvas, _layerBitmap.Info, layerPath, layerPaint);
+                baseLayerEffect.PostProcess(layerCanvas, _layerBitmap.Info, layerPath, canvasPaint);
 
             SKPoint targetLocation = new SKPoint(0, 0);
             if (Parent is Folder parentFolder)
                 targetLocation = Path.Bounds.Location - parentFolder.Path.Bounds.Location;
 
-            using SKPaint canvasPaint = new SKPaint {BlendMode = General.BlendMode.CurrentValue};
             using SKPath canvasPath = new SKPath(Path);
             canvasPath.Transform(SKMatrix.MakeTranslation(
                 (canvasPath.Bounds.Left - targetLocation.X) * -1,
diff --git a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreeGroupView.xaml b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreeGroupView.xaml
index 9a9a9d2a7..9e4ce273f 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreeGroupView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreeGroupView.xaml
@@ -227,7 +227,8 @@
         <ItemsControl ItemsSource="{Binding Children}"
                       Visibility="{Binding LayerPropertyGroupViewModel.IsExpanded, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}"
                       HorizontalAlignment="Stretch"
-                      HorizontalContentAlignment="Stretch">
+                      HorizontalContentAlignment="Stretch"
+                      dd:DragDrop.DragSourceIgnore="True">
             <ItemsControl.ItemContainerStyle>
                 <Style TargetType="ContentPresenter">
                     <Setter Property="VerticalAlignment" Value="Stretch" />
diff --git a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreeViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreeViewModel.cs
index ec17fd5c8..5c84fa57f 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreeViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreeViewModel.cs
@@ -1,10 +1,7 @@
 using System.Windows;
-using System.Windows.Forms;
+using System.Windows.Controls;
 using System.Windows.Input;
 using Stylet;
-using Control = System.Windows.Controls.Control;
-using KeyEventArgs = System.Windows.Input.KeyEventArgs;
-using Screen = Stylet.Screen;
 
 namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree
 {
@@ -27,12 +24,12 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree
                 return;
 
             e.Handled = true;
-            MouseWheelEventArgs eventArg = new MouseWheelEventArgs(e.MouseDevice, e.Timestamp, e.Delta)
+            var eventArg = new MouseWheelEventArgs(e.MouseDevice, e.Timestamp, e.Delta)
             {
                 RoutedEvent = UIElement.MouseWheelEvent,
                 Source = sender
             };
-            UIElement parent = ((Control) sender).Parent as UIElement;
+            var parent = ((Control) sender).Parent as UIElement;
             parent?.RaiseEvent(eventArg);
         }
     }