From 60055350004406ce123e9e340e15b1c756b0cbff Mon Sep 17 00:00:00 2001
From: Robert <mail@rbeekman.nl>
Date: Thu, 25 Mar 2021 00:20:27 +0100
Subject: [PATCH] Data bindings - Reduced pop-in in conditional data bindings

---
 .../PropertyInput/FloatPropertyInputView.xaml      |  1 +
 .../Conditions/DataModelConditionGroupView.xaml    |  2 +-
 .../LayerProperties/Tree/TreePropertyView.xaml     | 14 ++++----------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/Artemis.UI/DefaultTypes/PropertyInput/FloatPropertyInputView.xaml b/src/Artemis.UI/DefaultTypes/PropertyInput/FloatPropertyInputView.xaml
index 65e27826f..f3d4a2b4a 100644
--- a/src/Artemis.UI/DefaultTypes/PropertyInput/FloatPropertyInputView.xaml
+++ b/src/Artemis.UI/DefaultTypes/PropertyInput/FloatPropertyInputView.xaml
@@ -6,6 +6,7 @@
              xmlns:s="https://github.com/canton7/Stylet"
              xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:propertyInput="clr-namespace:Artemis.UI.DefaultTypes.PropertyInput"
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800"
              d:DataContext="{d:DesignInstance propertyInput:FloatPropertyInputViewModel}">
diff --git a/src/Artemis.UI/Screens/ProfileEditor/Conditions/DataModelConditionGroupView.xaml b/src/Artemis.UI/Screens/ProfileEditor/Conditions/DataModelConditionGroupView.xaml
index 421cf840d..7afa0ef9a 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/Conditions/DataModelConditionGroupView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Conditions/DataModelConditionGroupView.xaml
@@ -154,7 +154,7 @@
             </materialDesign:ToggleButtonAssist.OnContent>
         </ToggleButton>
 
-        <ItemsControl Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" ItemsSource="{Binding Items, IsAsync=True}" Margin="0 3 0 0">
+        <ItemsControl Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" ItemsSource="{Binding Items}" Margin="0 3 0 0">
             <ItemsControl.ItemTemplate>
                 <DataTemplate>
                     <ContentControl s:View.Model="{Binding}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" IsTabStop="False" />
diff --git a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyView.xaml b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyView.xaml
index 0286d24e2..c0def0d7b 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyView.xaml
@@ -70,16 +70,10 @@
                        ToolTip="{Binding LayerProperty.PropertyDescription.Description}"
                        HorizontalAlignment="Left" />
 
-            <ContentControl Grid.Column="2" Margin="5 0" s:View.Model="{Binding PropertyInputViewModel, IsAsync=True}"  ToolTip="{Binding LayerProperty.PropertyDescription.Description}">
-                <ContentControl.Resources>
-                    <Style TargetType="TextBlock">
-                        <Setter Property="Margin" Value="0 0 5 4" />
-                        <Setter Property="VerticalAlignment" Value="Bottom" />
-                        <Setter Property="FontSize" Value="11" />
-                        <Setter Property="FontWeight" Value="Light" />
-                    </Style>
-                </ContentControl.Resources>
-            </ContentControl>
+            <ContentControl Grid.Column="2" 
+                            Margin="5 0"
+                            s:View.Model="{Binding PropertyInputViewModel, IsAsync=True}" 
+                            ToolTip="{Binding LayerProperty.PropertyDescription.Description}"/>
 
             <Button Grid.Column="3"
                     Command="{s:Action ResetToDefault}"