Merge branch 'SPARK-1944-attach/detach/update' of bitbucket.org:bluetradesys/spark into SPARK-1944-attach/detach/update

This commit is contained in:
Pedro Pinto committed 2019-04-05 14:22:25 -04:00
commit bd2c2d6aa8
2 files changed
+2 -2

No files matched your search

@@ -265,7 +265,7 @@
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<TextBlock x:Name="root_algo_label" Margin="{StaticResource Margin.LP2}" Visibility="Collapsed">Algo</TextBlock>
<TextBlock x:Name="root_algo_label" VerticalAlignment="Center" Margin="{StaticResource Margin.LP2}" Visibility="Collapsed">Algo</TextBlock>
<ComboBox
x:Name="root_algo_combo_box"
Margin="40,0,0,0"
@@ -32,7 +32,7 @@
<u:StateManager.Groups>
<u:StateGroupsManager AttachToMembers="True">
<u:StateDefinitionCollection>
<u:StateDefinition State="{Binding ShowBBO, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static usp:OrderParamsPanel.BBOVisualStateConverter}}"/>
<u:StateDefinition State="{Binding Path='(u:StateDefinition.Group).(u:StateGroupsManager.Target).(Border.TemplatedParent).(usp:OrderParamsPanel.ShowBBO)', RelativeSource={RelativeSource Self}, Converter={x:Static usp:OrderParamsPanel.BBOVisualStateConverter}}"/>
<u:StateDefinition>
<MultiBinding Converter="{StaticResource CalculatorButtonsVisualStateConverter}">
<Binding Path="(u:StateDefinition.Group).(u:StateGroupsManager.Target).(Border.TemplatedParent).(usp:OrderParamsPanel.ShowAccount)" RelativeSource="{RelativeSource Self}"/>