DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-12 11:56:30 +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 committed 2020-10-06 19:45:30 +02:00
1 parent e2918798a4
commit 61a5cd09a6
3 files changed
+7 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreeGroupView.xaml
+2 -1
View File
@@ -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" />
src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreeViewModel.cs
+3 -6
View File
@@ -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);
}
}