From 89b98cde43f3f1959f7229c8823b31295e147d4b Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Wed, 27 Jun 2018 15:36:49 +0300
Subject: Machine Studio v1.0.0.6

---
 .../Tango.MachineStudio.Developer/Views/JobView.xaml   | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index 99b3a9712..258750800 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -1222,7 +1222,7 @@
 
                                                 </DockPanel>
                                             </Border>
-                                            <ListBox ScrollViewer.VerticalScrollBarVisibility="Disabled" Background="Transparent" BorderThickness="0" Style="{x:Null}" HorizontalContentAlignment="Stretch" ItemsSource="{Binding RmlProcessParametersTableGroup.ProcessParametersTables}" SelectedItem="{Binding SelectedProcessParametersTable}" IsEnabled="{Binding RmlProcessParametersTableGroup.Active}">
+                                            <ListBox ScrollViewer.VerticalScrollBarVisibility="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Disabled" Background="Transparent" BorderThickness="0" Style="{x:Null}" HorizontalContentAlignment="Stretch" ItemsSource="{Binding RmlProcessParametersTableGroup.ProcessParametersTables}" SelectedItem="{Binding SelectedProcessParametersTable}" IsEnabled="{Binding RmlProcessParametersTableGroup.Active}">
                                                 <ListBox.ItemContainerStyle>
                                                     <Style TargetType="ListBoxItem" BasedOn="{StaticResource basicListBoxItem}">
 
@@ -1235,9 +1235,9 @@
                                         </ListBox.ItemsPanel>-->
                                                 <ListBox.ItemTemplate>
                                                     <DataTemplate DataType="{x:Type observables:ProcessParametersTable}">
-                                                        <Border Padding="5" CornerRadius="5" BorderThickness="1" Height="245" Margin="5">
+                                                        <Border Padding="5" CornerRadius="5" BorderThickness="1" Margin="5">
                                                             <Border.Style>
-                                                                <Style TargetType="Border" BasedOn="{StaticResource brushStopBorder}">
+                                                                <Style TargetType="Border">
                                                                     <Setter Property="BorderBrush" Value="Silver"></Setter>
                                                                     <Setter Property="Opacity" Value="0.5"></Setter>
                                                                     <Setter Property="Background" Value="Transparent"></Setter>
@@ -1251,6 +1251,7 @@
                                                                 </Style>
                                                             </Border.Style>
                                                             <Grid>
+                                                                <StackPanel>
                                                                 <DockPanel>
                                                                     <TextBox materialDesign:HintAssist.Hint="Table Name" DockPanel.Dock="Top" Text="{Binding Name}"></TextBox>
                                                                     <WrapPanel Orientation="Vertical" Margin="0 5 0 0">
@@ -1271,14 +1272,14 @@
                                                                                 <Setter Property="Template">
                                                                                     <Setter.Value>
                                                                                         <ControlTemplate TargetType="ContentControl">
-                                                                                            <Grid>
+                                                                                            <Grid Width="97" FlowDirection="LeftToRight">
                                                                                                 <Border>
                                                                                                     <Border.Style>
                                                                                                         <Style TargetType="Border">
                                                                                                             <Setter Property="BorderBrush" Value="Gainsboro"></Setter>
                                                                                                             <Setter Property="BorderThickness" Value="1"></Setter>
                                                                                                             <Setter Property="Padding" Value="2"></Setter>
-                                                                                                            <Setter Property="Margin" Value="5"></Setter>
+                                                                                                            <Setter Property="Margin" Value="4"></Setter>
                                                                                                             <Setter Property="CornerRadius" Value="3"></Setter>
                                                                                                         </Style>
                                                                                                     </Border.Style>
@@ -1297,15 +1298,15 @@
                                                                         <editors:ParameterizedEditor ParameterizedObject="{Binding}">
                                                                             <editors:ParameterizedEditor.ItemsPanel>
                                                                                 <ItemsPanelTemplate>
-                                                                                    <WrapPanel IsItemsHost="True" Orientation="Vertical" />
+                                                                                    <WrapPanel IsItemsHost="True" Orientation="Horizontal" FlowDirection="RightToLeft" />
                                                                                 </ItemsPanelTemplate>
                                                                             </editors:ParameterizedEditor.ItemsPanel>
                                                                             <editors:ParameterizedEditor.DoubleTemplate>
                                                                                 <DataTemplate>
                                                                                     <ContentControl>
                                                                                         <StackPanel>
-                                                                                            <TextBlock Text="{Binding Name}" FontSize="10"></TextBlock>
-                                                                                            <mahapps:NumericUpDown FontSize="16" Minimum="0" Margin="0 5 0 0" HideUpDownButtons="True" HorizontalContentAlignment="Center" Maximum="10000" StringFormat="0.0" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" Value="{Binding Value,Mode=TwoWay}"></mahapps:NumericUpDown>
+                                                                                            <TextBlock Margin="0 5 0 5" TextAlignment="Right" Text="{Binding Name}" FontSize="10"></TextBlock>
+                                                                                            <mahapps:NumericUpDown FontSize="16" Minimum="0" Margin="0 0 5 0" HideUpDownButtons="True" HorizontalContentAlignment="Center" Maximum="10000" StringFormat="0.0" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" Value="{Binding Value,Mode=TwoWay}"></mahapps:NumericUpDown>
                                                                                         </StackPanel>
                                                                                     </ContentControl>
                                                                                 </DataTemplate>
@@ -1347,6 +1348,7 @@
                                                                         </materialDesign:PackIcon.Style>
                                                                     </materialDesign:PackIcon>
                                                                 </StackPanel>
+                                                                </StackPanel>
                                                             </Grid>
                                                         </Border>
                                                     </DataTemplate>
-- 
cgit v1.3.1