Profiles - Made data bindings compatible with timeline changes

2026-11-12 11:56:30 +00:00 · 2020-11-02 22:09:29 +01:00
1 parent 997ab005d8
commit 0f5c2b80c4
@@ -5,18 +5,13 @@
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
             xmlns:s="https://github.com/canton7/Stylet"
-             xmlns:dd="urn:gong-wpf-dragdrop" xmlns:Converters="clr-namespace:Artemis.UI.Converters"
-             xmlns:utilities="clr-namespace:Artemis.UI.Utilities"
+             xmlns:dd="urn:gong-wpf-dragdrop"
             mc:Ignorable="d"
             d:DesignHeight="450" d:DesignWidth="800">
    <UserControl.Resources>
        <ResourceDictionary>
            <ResourceDictionary.MergedDictionaries>
                <ResourceDictionary Source="pack://application:,,,/Artemis.UI;component/ResourceDictionaries/DataModelConditions.xaml" />
-                <ResourceDictionary>
-                    <Converters:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
-                    <utilities:BindingProxy x:Key="DataContextProxy" Data="{Binding}" />
-                </ResourceDictionary>
            </ResourceDictionary.MergedDictionaries>
        </ResourceDictionary>
    </UserControl.Resources>
@@ -27,43 +22,16 @@
        </Grid.RowDefinitions>

        <Button Grid.Row="0"
-                Style="{StaticResource DataModelConditionButtonLeftClickMenu}"
+                Style="{StaticResource DataModelConditionButton}"
                Background="{StaticResource PrimaryHueMidBrush}"
                BorderBrush="{StaticResource PrimaryHueMidBrush}"
-                HorizontalAlignment="Right">
+                HorizontalAlignment="Right"
+                Command="{s:Action AddCondition}">
            ADD CONDITION
-            <Button.ContextMenu>
-                <ContextMenu>
-                    <MenuItem Header="Add static condition"
-                              ToolTip="A condition that compares with a static input"
-                              Command="{s:Action AddCondition}"
-                              CommandParameter="Static">
-                        <MenuItem.Icon>
-                            <materialDesign:PackIcon Kind="FormTextarea" />
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Add dynamic condition"
-                              ToolTip="A condition that compares with a data model property"
-                              Command="{s:Action AddCondition}"
-                              CommandParameter="Dynamic">
-                        <MenuItem.Icon>
-                            <materialDesign:PackIcon Kind="Link" />
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Add list condition"
-                              ToolTip="A condition that evaluates on items in a list"
-                              Command="{s:Action AddCondition}"
-                              CommandParameter="List">
-                        <MenuItem.Icon>
-                            <materialDesign:PackIcon Kind="FormatListBulleted" />
-                        </MenuItem.Icon>
-                    </MenuItem>
-                </ContextMenu>
-            </Button.ContextMenu>
        </Button>

        <ListBox Grid.Row="1"
-                 ItemsSource="{Binding ConditionViewModels}"
+                 ItemsSource="{Binding Items}"
                 materialDesign:RippleAssist.IsDisabled="True"
                 dd:DragDrop.IsDragSource="True"
                 dd:DragDrop.IsDropTarget="True"
@@ -10,7 +10,7 @@ using Stylet;

 namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.ConditionalDataBinding
 {
-    public class ConditionalDataBindingModeViewModel<TLayerProperty, TProperty> : Screen, IDataBindingModeViewModel
+    public class ConditionalDataBindingModeViewModel<TLayerProperty, TProperty> : Conductor<DataBindingConditionViewModel<TLayerProperty, TProperty>>.Collection.AllActive, IDataBindingModeViewModel
    {
        private readonly IDataBindingsVmFactory _dataBindingsVmFactory;
        private readonly IProfileEditorService _profileEditorService;
@@ -24,18 +24,83 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.Conditio
            _dataBindingsVmFactory = dataBindingsVmFactory;

            ConditionalDataBinding = conditionalDataBinding;
-            ConditionViewModels = new BindableCollection<DataBindingConditionViewModel<TLayerProperty, TProperty>>();
-
-            Initialize();
        }

        public ConditionalDataBinding<TLayerProperty, TProperty> ConditionalDataBinding { get; }
-        public BindableCollection<DataBindingConditionViewModel<TLayerProperty, TProperty>> ConditionViewModels { get; }
+
+        public void AddCondition()
+        {
+            DataBindingCondition<TLayerProperty, TProperty> condition = ConditionalDataBinding.AddCondition();
+
+            // Find the VM of the new condition
+            DataBindingConditionViewModel<TLayerProperty, TProperty> viewModel = Items.First(c => c.DataBindingCondition == condition);
+            viewModel.ActiveItem.AddCondition();
+
+            _profileEditorService.UpdateSelectedProfileElement();
+        }
+
+        protected override void OnInitialActivate()
+        {
+            base.OnInitialActivate();
+            Initialize();
+        }
+
+        private void UpdateItems()
+        {
+            _updating = true;
+
+            // Remove old VMs
+            List<DataBindingConditionViewModel<TLayerProperty, TProperty>> toRemove = Items.Where(c => !ConditionalDataBinding.Conditions.Contains(c.DataBindingCondition)).ToList();
+            foreach (DataBindingConditionViewModel<TLayerProperty, TProperty> dataBindingConditionViewModel in toRemove)
+            {
+                Items.Remove(dataBindingConditionViewModel);
+                dataBindingConditionViewModel.Dispose();
+            }
+
+            // Add missing VMs
+            foreach (DataBindingCondition<TLayerProperty, TProperty> condition in ConditionalDataBinding.Conditions)
+                if (Items.All(c => c.DataBindingCondition != condition))
+                    Items.Add(_dataBindingsVmFactory.DataBindingConditionViewModel(condition));
+
+            // Fix order
+            ((BindableCollection<DataBindingConditionViewModel<TLayerProperty, TProperty>>) Items).Sort(c => c.DataBindingCondition.Order);
+
+            _updating = false;
+        }
+
+        private void Initialize()
+        {
+            ConditionalDataBinding.ConditionsUpdated += ConditionalDataBindingOnConditionsUpdated;
+            Items.CollectionChanged += ItemsOnCollectionChanged;
+            UpdateItems();
+        }
+
+        private void ItemsOnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (_updating || e.Action != NotifyCollectionChangedAction.Add)
+                return;
+
+            for (int index = 0; index < Items.Count; index++)
+            {
+                DataBindingConditionViewModel<TLayerProperty, TProperty> conditionViewModel = Items[index];
+                conditionViewModel.DataBindingCondition.Order = index + 1;
+            }
+
+            ConditionalDataBinding.ApplyOrder();
+
+            _profileEditorService.UpdateSelectedProfileElement();
+        }
+
+        private void ConditionalDataBindingOnConditionsUpdated(object sender, EventArgs e)
+        {
+            UpdateItems();
+        }
+
        public bool SupportsTestValue => false;

        public void Update()
        {
-            UpdateConditionViewModels();
+            UpdateItems();
        }

        public object GetTestValue()
@@ -49,64 +114,11 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.Conditio
        {
            ConditionalDataBinding.ConditionsUpdated -= ConditionalDataBindingOnConditionsUpdated;

-            foreach (DataBindingConditionViewModel<TLayerProperty, TProperty> conditionViewModel in ConditionViewModels)
+            foreach (DataBindingConditionViewModel<TLayerProperty, TProperty> conditionViewModel in Items)
                conditionViewModel.Dispose();
-            ConditionViewModels.Clear();
+            Items.Clear();
        }

        #endregion
-
-        private void UpdateConditionViewModels()
-        {
-            _updating = true;
-
-            // Remove old VMs
-            List<DataBindingConditionViewModel<TLayerProperty, TProperty>> toRemove = ConditionViewModels.Where(c => !ConditionalDataBinding.Conditions.Contains(c.DataBindingCondition)).ToList();
-            foreach (DataBindingConditionViewModel<TLayerProperty, TProperty> dataBindingConditionViewModel in toRemove)
-            {
-                ConditionViewModels.Remove(dataBindingConditionViewModel);
-                dataBindingConditionViewModel.Dispose();
-            }
-
-            // Add missing VMs
-            foreach (DataBindingCondition<TLayerProperty, TProperty> condition in ConditionalDataBinding.Conditions)
-            {
-                if (ConditionViewModels.All(c => c.DataBindingCondition != condition))
-                    ConditionViewModels.Add(_dataBindingsVmFactory.DataBindingConditionViewModel(condition));
-            }
-
-            // Fix order
-            ConditionViewModels.Sort(c => c.DataBindingCondition.Order);
-
-            _updating = false;
-        }
-
-        private void Initialize()
-        {
-            ConditionalDataBinding.ConditionsUpdated += ConditionalDataBindingOnConditionsUpdated;
-            ConditionViewModels.CollectionChanged += ConditionViewModelsOnCollectionChanged;
-            UpdateConditionViewModels();
-        }
-
-        private void ConditionViewModelsOnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            if (_updating || e.Action != NotifyCollectionChangedAction.Add)
-                return;
-
-            for (int index = 0; index < ConditionViewModels.Count; index++)
-            {
-                DataBindingConditionViewModel<TLayerProperty, TProperty> conditionViewModel = ConditionViewModels[index];
-                conditionViewModel.DataBindingCondition.Order = index + 1;
-            }
-
-            ConditionalDataBinding.ApplyOrder();
-
-            _profileEditorService.UpdateSelectedProfileElement();
-        }
-
-        private void ConditionalDataBindingOnConditionsUpdated(object sender, EventArgs e)
-        {
-            UpdateConditionViewModels();
-        }
    }
 }
@@ -18,7 +18,7 @@
                        IsTabStop="False" />

        <ContentControl Grid.Row="1"
-                        Margin="26 5 0 0"
+                        Margin="26 2 0 0"
                        s:View.Model="{Binding ValueViewModel}"
                        VerticalContentAlignment="Stretch"
                        HorizontalContentAlignment="Stretch"
@@ -13,6 +13,8 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.Conditio
    public class DataBindingConditionViewModel<TLayerProperty, TProperty> : Conductor<DataModelConditionGroupViewModel>, IDisposable
    {
        private readonly IProfileEditorService _profileEditorService;
+        private readonly IDataModelConditionsVmFactory _dataModelConditionsVmFactory;
+        private readonly IDataModelUIService _dataModelUIService;

        public DataBindingConditionViewModel(DataBindingCondition<TLayerProperty, TProperty> dataBindingCondition,
            IProfileEditorService profileEditorService,
@@ -20,22 +22,28 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.Conditio
            IDataModelUIService dataModelUIService)
        {
            _profileEditorService = profileEditorService;
+            _dataModelConditionsVmFactory = dataModelConditionsVmFactory;
+            _dataModelUIService = dataModelUIService;
            DataBindingCondition = dataBindingCondition;
-
-            ActiveItem = dataModelConditionsVmFactory.DataModelConditionGroupViewModel(DataBindingCondition.Condition, ConditionGroupType.General);
-            ActiveItem.IsRootGroup = true;
-            ActiveItem.Update();
-            ActiveItem.Updated += ActiveItemOnUpdated;
-
-            ValueViewModel = dataModelUIService.GetStaticInputViewModel(typeof(TProperty), null);
-            ValueViewModel.ValueUpdated += ValueViewModelOnValueUpdated;
-            ValueViewModel.Value = DataBindingCondition.Value;
        }

        public DataBindingCondition<TLayerProperty, TProperty> DataBindingCondition { get; }

        public DataModelStaticViewModel ValueViewModel { get; set; }

+        protected override void OnInitialActivate()
+        {
+            base.OnInitialActivate();
+            ActiveItem = _dataModelConditionsVmFactory.DataModelConditionGroupViewModel(DataBindingCondition.Condition, ConditionGroupType.General);
+            ActiveItem.IsRootGroup = true;
+            ActiveItem.Update();
+            ActiveItem.Updated += ActiveItemOnUpdated;
+
+            ValueViewModel = _dataModelUIService.GetStaticInputViewModel(typeof(TProperty), null);
+            ValueViewModel.ValueUpdated += ValueViewModelOnValueUpdated;
+            ValueViewModel.Value = DataBindingCondition.Value;
+        }
+
        public void Dispose()
        {
            ValueViewModel.Dispose();