Display conditions - Implemented most of static input

src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml

@@ -79,7 +79,7 @@
                 Grid.Column="2"
                 Style="{StaticResource DisplayConditionButtonLeftClickMenu}"
                 Background="#7B7B7B"
-                BorderBrush="#7B7B7B" 
+                BorderBrush="#7B7B7B"
                 Content="{Binding DisplayConditionPredicate.Operator.Description}"
                 Click="PropertyButton_OnClick">
             <Button.ContextMenu>
@@ -87,8 +87,8 @@
                     <ContextMenu.ItemTemplate>
                         <DataTemplate>
                             <StackPanel Orientation="Horizontal">
-                                <materialDesign:PackIcon Kind="{Binding Icon}" VerticalAlignment="Center" Margin="0 0 15 0"/>
-                                <TextBlock Text="{Binding Description}" VerticalAlignment="Center"/>
+                                <materialDesign:PackIcon Kind="{Binding Icon}" VerticalAlignment="Center" Margin="0 0 15 0" />
+                                <TextBlock Text="{Binding Description}" VerticalAlignment="Center" />
                             </StackPanel>
                         </DataTemplate>
                     </ContextMenu.ItemTemplate>
@@ -139,26 +139,30 @@
         <Grid Grid.Row="0"
               Grid.Column="3"
               Visibility="{Binding ShowRightSidePropertySelection, Converter={x:Static s:BoolToVisibilityConverter.InverseInstance}, Mode=OneWay}">
-            <materialDesign:Transitioner
-                SelectedIndex="{Binding RightSideTransitionIndex}"
-                DefaultTransitionOrigin="0.5, 0.5"
-                Margin="3 -4">
+            <materialDesign:Transitioner SelectedIndex="{Binding RightSideTransitionIndex}" DefaultTransitionOrigin="0.5, 0.5" Margin="3 -4">
                 <Button Style="{StaticResource DisplayConditionButton}"
                         Background="{DynamicResource PrimaryHueMidBrush}"
                         BorderBrush="{DynamicResource PrimaryHueMidBrush}"
                         Margin="0 4"
-                        Content="PredicateRightSide"
                         Command="{s:Action ActivateRightSideInputViewModel}"
-                        HorizontalAlignment="Left" />
+                        HorizontalAlignment="Left">
+                    <Grid>
+                        <TextBlock Text="{Binding DisplayConditionPredicate.RightStaticValue}"
+                                   Visibility="{Binding DisplayConditionPredicate.RightStaticValue, Converter={StaticResource NullToVisibilityConverter}}" />
+                        <TextBlock Text="« Enter a value »"
+                                   FontStyle="Italic"
+                                   Visibility="{Binding DisplayConditionPredicate.RightStaticValue, Converter={StaticResource NullToVisibilityConverter}, ConverterParameter=Inverted}" />
+                    </Grid>
+                </Button>
                 <Border BorderBrush="{DynamicResource PrimaryHueMidBrush}"
-                        BorderThickness="2"
+                        Background="{DynamicResource MaterialDesignPaper}"
                         CornerRadius="3"
                         Padding="3"
-                        Width="140">
+                        Width="140"
+                        HorizontalAlignment="Left">
                     <ContentControl s:View.Model="{Binding RightSideInputViewModel}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" />
                 </Border>
             </materialDesign:Transitioner>
-
         </Grid>
     </Grid>
 </UserControl>

src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionPredicateViewModel.cs

@@ -2,21 +2,26 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Input;
 using Artemis.Core.Models.Profile.Conditions;
 using Artemis.Core.Services.Interfaces;
+using Artemis.UI.Events;
 using Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions.Abstract;
 using Artemis.UI.Shared.DataModelVisualization;
 using Artemis.UI.Shared.DataModelVisualization.Shared;
 using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Services.Interfaces;
 using Artemis.UI.Utilities;
+using Stylet;
 
 namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
 {
-    public class DisplayConditionPredicateViewModel : DisplayConditionViewModel
+    public class DisplayConditionPredicateViewModel : DisplayConditionViewModel, IHandle<MainWindowKeyEvent>, IHandle<MainWindowMouseEvent>
     {
         private readonly IDataModelService _dataModelService;
         private readonly IDataModelVisualizationService _dataModelVisualizationService;
+        private readonly IEventAggregator _eventAggregator;
         private readonly IProfileEditorService _profileEditorService;
         private DataModelPropertiesViewModel _leftSideDataModel;
         private List<DisplayConditionOperator> _operators;
@@ -28,13 +33,18 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
 
         private List<Type> _supportedInputTypes;
 
-        public DisplayConditionPredicateViewModel(DisplayConditionPredicate displayConditionPredicate, DisplayConditionViewModel parent,
-            IProfileEditorService profileEditorService, IDataModelVisualizationService dataModelVisualizationService, IDataModelService dataModelService)
+        public DisplayConditionPredicateViewModel(DisplayConditionPredicate displayConditionPredicate,
+            DisplayConditionViewModel parent,
+            IProfileEditorService profileEditorService,
+            IDataModelVisualizationService dataModelVisualizationService,
+            IDataModelService dataModelService,
+            IEventAggregator eventAggregator)
             : base(displayConditionPredicate, parent)
         {
             _profileEditorService = profileEditorService;
             _dataModelVisualizationService = dataModelVisualizationService;
             _dataModelService = dataModelService;
+            _eventAggregator = eventAggregator;
 
             SelectLeftPropertyCommand = new DelegateCommand(ExecuteSelectLeftProperty);
             SelectRightPropertyCommand = new DelegateCommand(ExecuteSelectRightProperty);
@@ -48,6 +58,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
         public DelegateCommand SelectRightPropertyCommand { get; }
         public DelegateCommand SelectOperatorCommand { get; }
         public bool ShowRightSidePropertySelection => DisplayConditionPredicate.PredicateType == PredicateType.Dynamic;
+        public bool CanActivateRightSideInputViewModel => SelectedLeftSideProperty?.PropertyInfo != null;
 
         public bool IsInitialized { get; private set; }
 
@@ -66,7 +77,11 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
         public DataModelVisualizationViewModel SelectedLeftSideProperty
         {
             get => _selectedLeftSideProperty;
-            set => SetAndNotify(ref _selectedLeftSideProperty, value);
+            set
+            {
+                if (!SetAndNotify(ref _selectedLeftSideProperty, value)) return;
+                NotifyOfPropertyChange(nameof(CanActivateRightSideInputViewModel));
+            }
         }
 
         public DataModelVisualizationViewModel SelectedRightSideProperty
@@ -93,6 +108,26 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
             set => SetAndNotify(ref _operators, value);
         }
 
+        public void Handle(MainWindowKeyEvent message)
+        {
+            if (RightSideInputViewModel == null)
+                return;
+
+            if (!message.KeyDown && message.EventArgs.Key == Key.Escape) 
+                RightSideInputViewModel.Cancel();
+            if (!message.KeyDown && message.EventArgs.Key == Key.Enter)
+                RightSideInputViewModel.Submit();
+        }
+
+        public void Handle(MainWindowMouseEvent message)
+        {
+            if (RightSideInputViewModel == null)
+                return;
+
+            if (message.Sender is FrameworkElement frameworkElement && !frameworkElement.IsDescendantOf(RightSideInputViewModel.View)) 
+                RightSideInputViewModel.Submit();
+        }
+
         public void Initialize()
         {
             Task.Run(() =>
@@ -155,7 +190,37 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
 
         public void ActivateRightSideInputViewModel()
         {
+            if (SelectedLeftSideProperty?.PropertyInfo == null)
+                return;
+
             RightSideTransitionIndex = 1;
+            RightSideInputViewModel = _dataModelVisualizationService.GetDataModelInputViewModel(
+                SelectedLeftSideProperty.PropertyInfo.PropertyType,
+                SelectedLeftSideProperty.PropertyDescription,
+                DisplayConditionPredicate.RightStaticValue,
+                UpdateInputValue
+            );
+            _eventAggregator.Subscribe(this);
+
+            // After the animation finishes attempt to focus the input field
+            Task.Run(async () =>
+            {
+                await Task.Delay(400);
+                await Execute.OnUIThreadAsync(() => RightSideInputViewModel.View.MoveFocus(new TraversalRequest(FocusNavigationDirection.First)));
+            });
+        }
+
+        public void UpdateInputValue(object value, bool isSubmitted)
+        {
+            if (isSubmitted)
+            {
+                DisplayConditionPredicate.RightStaticValue = value;
+                Update();
+            }
+
+            RightSideTransitionIndex = 0;
+            RightSideInputViewModel = null;
+            _eventAggregator.Unsubscribe(this);
         }
 
         private void ExecuteSelectLeftProperty(object context)

src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerEffects/EffectsView.xaml

@@ -27,7 +27,7 @@
                  Visibility="{Binding HasLayerEffectDescriptors, Converter={x:Static s:BoolToVisibilityConverter.Instance}}">
             <ListBox.ItemContainerStyle>
                 <Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource {x:Type ListBoxItem}}">
-                    <Setter Property="behaviors:MouseBehaviour.MouseUpCommand" Value="{x:Static materialDesign:Transitioner.MoveFirstCommand}" />
+                    <Setter Property="behaviors:MouseBehavior.MouseUpCommand" Value="{x:Static materialDesign:Transitioner.MoveFirstCommand}" />
                 </Style>
             </ListBox.ItemContainerStyle>
             <ListBox.ItemTemplate>

src/Artemis.UI/Screens/RootView.xaml

@@ -20,6 +20,8 @@
                     Activated="{s:Action WindowActivated}"
                     KeyDown="{s:Action WindowKeyDown}"
                     KeyUp="{s:Action WindowKeyUp}"
+                    MouseDown="{s:Action WindowMouseDown}"
+                    MouseUp="{s:Action WindowMouseUp}"
                     d:DesignHeight="640" d:DesignWidth="1200" d:DataContext="{d:DesignInstance screens:RootViewModel}">
     <mde:MaterialWindow.Resources>
         <Style TargetType="ContentControl" x:Key="InitializingFade">

src/Artemis.UI/Screens/RootViewModel.cs

@@ -105,12 +105,21 @@ namespace Artemis.UI.Screens
 
         public void WindowKeyDown(object sender, KeyEventArgs e)
         {
-            _eventAggregator.Publish(new MainWindowKeyEvent(true, e));
+            _eventAggregator.Publish(new MainWindowKeyEvent(sender, true, e));
         }
 
         public void WindowKeyUp(object sender, KeyEventArgs e)
         {
-            _eventAggregator.Publish(new MainWindowKeyEvent(false, e));
+            _eventAggregator.Publish(new MainWindowKeyEvent(sender, false, e));
+        }
+        public void WindowMouseDown(object sender, MouseButtonEventArgs e)
+        {
+            _eventAggregator.Publish(new MainWindowMouseEvent(sender, true, e));
+        }
+
+        public void WindowMouseUp(object sender, MouseButtonEventArgs e)
+        {
+            _eventAggregator.Publish(new MainWindowMouseEvent(sender, false, e));
         }