diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-07-23 16:36:59 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-07-23 16:36:59 +0300 |
| commit | 7c429939d3857ac22e5dccb6757bae679a017ed9 (patch) | |
| tree | 9984bd155dea3312c89425d77f0a1f6cfab60e9e /Software/Visual_Studio/MachineStudio | |
| parent | f18636711f5cdf36f561dfe4da93335a08000877 (diff) | |
| download | Tango-7c429939d3857ac22e5dccb6757bae679a017ed9.tar.gz Tango-7c429939d3857ac22e5dccb6757bae679a017ed9.zip | |
Added combobox style to some items
Related Work Items: #3099
Diffstat (limited to 'Software/Visual_Studio/MachineStudio')
3 files changed, 7 insertions, 7 deletions
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> diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml index 11dc2bad3..222eecb71 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml @@ -556,7 +556,7 @@ <Border Grid.Row="0" CornerRadius="2 2 0 0" Background="{DynamicResource ComboBox.Floating.Background}" - Height="0"/> + Height="{StaticResource PopupTopBottomMargin}"/> <Grid Grid.Row="1"> <Grid.ColumnDefinitions> @@ -575,7 +575,7 @@ <ContentPresenter Grid.Row="3"/> - <Border Grid.Row="4" CornerRadius="0 0 2 2" Height="0" Background="{DynamicResource ComboBox.Floating.Background}" /> + <Border Grid.Row="4" CornerRadius="0 0 2 2" Height="{StaticResource PopupTopBottomMargin}" Background="{DynamicResource ComboBox.Floating.Background}" /> </Grid> </Grid> </ControlTemplate> @@ -675,7 +675,7 @@ <Setter Property="ItemContainerStyle" Value="{StaticResource MaterialDesignComboBoxItemStyle}" /> </Trigger> <Trigger SourceName="PART_Popup" Property="IsOpen" Value="True"> - <Setter Property="Background" TargetName="templateRoot" Value="{DynamicResource ComboBox.Floating.Background}" /> + <Setter Property="Background" TargetName="templateRoot" Value="Transparent" /> </Trigger> <Trigger Property="IsEnabled" Value="False"> <Setter TargetName="templateRoot" Property="Opacity" Value="0.56"/> |