From 7c429939d3857ac22e5dccb6757bae679a017ed9 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Thu, 23 Jul 2020 16:36:59 +0300
Subject: Added combobox style to some items

Related Work Items: #3099
---
 .../Modules/MachineStudio.Dispensers/Views/DispenserView.xaml         | 4 ++--
 .../Views/MachineSettingsView.xaml                                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml
index 0a63e6423..e0f93df5a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml
@@ -51,9 +51,9 @@
                         <TextBox Text="{Binding ActiveDispenser.SerialNumber}"></TextBox>
 
                         <TextBlock FontWeight="SemiBold">Dispenser Type:</TextBlock>
-                        <ComboBox ItemsSource="{Binding DispenserTypes}" SelectedItem="{Binding ActiveDispenser.DispenserType}" DisplayMemberPath="Name"></ComboBox>
+                        <ComboBox ItemsSource="{Binding DispenserTypes}" SelectedItem="{Binding ActiveDispenser.DispenserType}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}" ></ComboBox>
 
-                        <TextBlock FontWeight="SemiBold">Nanoliter / Pulse:</TextBlock>
+                        <TextBlock FontWeight="SemiBold">Nanoliter / Pulse:</TextBlock> 
                         <mahapps:NumericUpDown HorizontalContentAlignment="Left" HasDecimals="True" BorderThickness="0 0 0 1" Background="Transparent" Minimum="0" Maximum="5" Value="{Binding ActiveDispenser.NlPerPulse}"></mahapps:NumericUpDown>
 
                         <TextBlock FontWeight="SemiBold">Part Number:</TextBlock>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
index 954ac5f0e..76517ec37 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
@@ -51,10 +51,10 @@
                                     <TextBox Text="{Binding ActiveMachine.Name}"></TextBox>
 
                                     <TextBlock FontWeight="SemiBold">Head Type</TextBlock>
-                                    <ComboBox ItemsSource="{Binding Source={x:Type enumerations:HeadTypes},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValue="{Binding ActiveMachine.MachineHeadType}" SelectedValuePath="Value" DisplayMemberPath="DisplayName"></ComboBox>
+                                    <ComboBox ItemsSource="{Binding Source={x:Type enumerations:HeadTypes},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValue="{Binding ActiveMachine.MachineHeadType}" SelectedValuePath="Value" DisplayMemberPath="DisplayName" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
 
                                     <TextBlock FontWeight="SemiBold">Machine Version</TextBlock>
-                                    <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.MachineVersions}" SelectedItem="{Binding ActiveMachine.MachineVersion}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
+                                    <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.MachineVersions}" SelectedItem="{Binding ActiveMachine.MachineVersion}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}" ></ComboBox>
 
                                     <TextBlock FontWeight="SemiBold">Organization</TextBlock>
                                     <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.Organizations}" SelectedItem="{Binding ActiveMachine.Organization}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
-- 
cgit v1.3.1