DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Effects - Fixed post processing effects not being applied

Browse Source 
Property tree - Fixed drag and drop interfering with property dragging
This commit is contained in:
Robert 2020-10-06 19:45:30 +02:00
parent e2918798a4
commit 61a5cd09a6
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Artemis.Core/Models/Profile/Layer.cs
View File

@ -388,14 +388,14 @@ namespace Artemis.Core
else if (General.ResizeMode.CurrentValue == LayerResizeMode.Clip) else if (General.ResizeMode.CurrentValue == LayerResizeMode.Clip)
ClipRender(layerCanvas, _layerBitmap.Info, layerPaint, layerPath); ClipRender(layerCanvas, _layerBitmap.Info, layerPaint, layerPath);
using SKPaint canvasPaint = new SKPaint { BlendMode = General.BlendMode.CurrentValue };
foreach (BaseLayerEffect baseLayerEffect in LayerEffects.Where(e => e.Enabled)) 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); SKPoint targetLocation = new SKPoint(0, 0);
if (Parent is Folder parentFolder) if (Parent is Folder parentFolder)
targetLocation = Path.Bounds.Location - parentFolder.Path.Bounds.Location; targetLocation = Path.Bounds.Location - parentFolder.Path.Bounds.Location;
using SKPaint canvasPaint = new SKPaint {BlendMode = General.BlendMode.CurrentValue};
using SKPath canvasPath = new SKPath(Path); using SKPath canvasPath = new SKPath(Path);
canvasPath.Transform(SKMatrix.MakeTranslation( canvasPath.Transform(SKMatrix.MakeTranslation(
(canvasPath.Bounds.Left - targetLocation.X) * -1, (canvasPath.Bounds.Left - targetLocation.X) * -1,

3
src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreeGroupView.xaml
View File

@ -227,7 +227,8 @@
<ItemsControl ItemsSource="{Binding Children}" <ItemsControl ItemsSource="{Binding Children}"
Visibility="{Binding LayerPropertyGroupViewModel.IsExpanded, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}" Visibility="{Binding LayerPropertyGroupViewModel.IsExpanded, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
HorizontalContentAlignment="Stretch"> HorizontalContentAlignment="Stretch"
dd:DragDrop.DragSourceIgnore="True">
<ItemsControl.ItemContainerStyle> <ItemsControl.ItemContainerStyle>
<Style TargetType="ContentPresenter"> <Style TargetType="ContentPresenter">
<Setter Property="VerticalAlignment" Value="Stretch" /> <Setter Property="VerticalAlignment" Value="Stretch" />

9
src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreeViewModel.cs
View File

@ -1,10 +1,7 @@
using System.Windows; using System.Windows;
using System.Windows.Forms; using System.Windows.Controls;
using System.Windows.Input; using System.Windows.Input;
using Stylet; 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 namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree
{ {
@ -27,12 +24,12 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree
return; return;
e.Handled = true; 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, RoutedEvent = UIElement.MouseWheelEvent,
Source = sender Source = sender
}; };
UIElement parent = ((Control) sender).Parent as UIElement; var parent = ((Control) sender).Parent as UIElement;
parent?.RaiseEvent(eventArg); parent?.RaiseEvent(eventArg);
} }
} }