From 1a829034491064e2d84355e713bd596f5992d190 Mon Sep 17 00:00:00 2001
From: Robert <mail@rbeekman.nl>
Date: Wed, 21 Apr 2021 17:25:55 +0200
Subject: [PATCH] Data model - Fixed prefix positioning

Data model - Fixed prefix and affix not working on SKColors
---
 .../Display/DefaultDataModelDisplayView.xaml  | 10 ++-
 .../Display/SKColorDataModelDisplayView.xaml  | 63 +++++++++++++------
 2 files changed, 51 insertions(+), 22 deletions(-)

diff --git a/src/Artemis.UI.Shared/DefaultTypes/DataModel/Display/DefaultDataModelDisplayView.xaml b/src/Artemis.UI.Shared/DefaultTypes/DataModel/Display/DefaultDataModelDisplayView.xaml
index a190a550a..b722b7d59 100644
--- a/src/Artemis.UI.Shared/DefaultTypes/DataModel/Display/DefaultDataModelDisplayView.xaml
+++ b/src/Artemis.UI.Shared/DefaultTypes/DataModel/Display/DefaultDataModelDisplayView.xaml
@@ -14,16 +14,19 @@
     </UserControl.Resources>
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="Auto"/>
         </Grid.ColumnDefinitions>
 
+        <!-- Prefix -->
         <TextBlock Grid.Column="0" 
                    Text="{Binding PropertyDescription.Prefix}"
                    Visibility="{Binding PropertyDescription.Prefix, Converter={StaticResource NullToVisibilityConverter}}" 
+                   TextAlignment="Right"
                    Margin="0 0 5 0" />
-        <!-- Value display -->
+
+        <!-- Value -->
         <TextBlock Grid.Column="1"
                    Text="{Binding DisplayValue, Mode=OneWay}"
                    HorizontalAlignment="Right"
@@ -35,6 +38,7 @@
                    Foreground="{DynamicResource MaterialDesignCheckBoxDisabled}"
                    Visibility="{Binding ShowNull, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}" />
 
+        <!-- Affix -->
         <TextBlock Grid.Column="2" 
                    Text="{Binding PropertyDescription.Affix}"
                    Visibility="{Binding PropertyDescription.Affix, Converter={StaticResource NullToVisibilityConverter}}" 
diff --git a/src/Artemis.UI/DefaultTypes/DataModel/Display/SKColorDataModelDisplayView.xaml b/src/Artemis.UI/DefaultTypes/DataModel/Display/SKColorDataModelDisplayView.xaml
index 084f60cef..e6215d1a6 100644
--- a/src/Artemis.UI/DefaultTypes/DataModel/Display/SKColorDataModelDisplayView.xaml
+++ b/src/Artemis.UI/DefaultTypes/DataModel/Display/SKColorDataModelDisplayView.xaml
@@ -5,6 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
              xmlns:display="clr-namespace:Artemis.UI.DefaultTypes.DataModel.Display"
+             xmlns:s="https://github.com/canton7/Stylet"
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800"
              d:DataContext="{d:DesignInstance {x:Type display:SKColorDataModelDisplayViewModel}}">
@@ -15,25 +16,49 @@
             </ResourceDictionary.MergedDictionaries>
             <shared:ColorToStringConverter x:Key="SKColorToStringConverter" />
             <shared:SKColorToColorConverter x:Key="SKColorToColorConverter" />
+            <shared:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
         </ResourceDictionary>
     </UserControl.Resources>
-    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-        <TextBlock x:Name="HexDisplay"
-                   Text="{Binding DisplayValue, Converter={StaticResource SKColorToStringConverter}}"
-                   VerticalAlignment="Center"
-                   HorizontalAlignment="Stretch" />
-        <Border Width="{Binding ActualHeight, ElementName=HexDisplay}"
-                Height="{Binding ActualHeight, ElementName=HexDisplay}"
-                CornerRadius="{Binding ActualHeight, ElementName=HexDisplay}"
-                Margin="5 0 0 0"
-                VerticalAlignment="Center"
-                HorizontalAlignment="Right"
-                Background="{StaticResource Checkerboard}">
-            <Ellipse Stroke="{DynamicResource NormalBorderBrush}">
-                <Ellipse.Fill>
-                    <SolidColorBrush Color="{Binding DisplayValue, Converter={StaticResource SKColorToColorConverter}}" />
-                </Ellipse.Fill>
-            </Ellipse>
-        </Border>
-    </StackPanel>
+
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+        </Grid.ColumnDefinitions>
+
+        <!-- Prefix -->
+        <TextBlock Grid.Column="0" 
+                   Text="{Binding PropertyDescription.Prefix}"
+                   Visibility="{Binding PropertyDescription.Prefix, Converter={StaticResource NullToVisibilityConverter}}" 
+                   TextAlignment="Right"
+                   Margin="0 0 5 0" />
+
+        <!-- Value -->
+        <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
+            <TextBlock x:Name="HexDisplay"
+                       Text="{Binding DisplayValue, Converter={StaticResource SKColorToStringConverter}}"
+                       VerticalAlignment="Center"
+                       HorizontalAlignment="Stretch" />
+            <Border Width="{Binding ActualHeight, ElementName=HexDisplay}"
+                    Height="{Binding ActualHeight, ElementName=HexDisplay}"
+                    CornerRadius="{Binding ActualHeight, ElementName=HexDisplay}"
+                    Margin="5 0 0 0"
+                    VerticalAlignment="Center"
+                    HorizontalAlignment="Right"
+                    Background="{StaticResource Checkerboard}">
+                <Ellipse Stroke="{DynamicResource NormalBorderBrush}">
+                    <Ellipse.Fill>
+                        <SolidColorBrush Color="{Binding DisplayValue, Converter={StaticResource SKColorToColorConverter}}" />
+                    </Ellipse.Fill>
+                </Ellipse>
+            </Border>
+        </StackPanel>
+
+        <!-- Affix -->
+        <TextBlock Grid.Column="2" 
+                   Text="{Binding PropertyDescription.Affix}"
+                   Visibility="{Binding PropertyDescription.Affix, Converter={StaticResource NullToVisibilityConverter}}" 
+                   Margin="5 0 0 0" />
+    </Grid>
 </UserControl>
\ No newline at end of file