don't shrink Settings button when resizing; fix xaml indentions that were driving me crazy

This commit is contained in:
Jake Norbut committed 2018-12-10 17:10:01 -06:00
1 parent b33b671342
commit c88db07474
1 file changed
+84 -89
@@ -123,7 +123,7 @@
<Style x:Key="LadderMenuButton" TargetType="Button">
<Setter Property="BorderThickness" Value="1"/>
<Setter Property="HorizontalAlignment" Value="Stretch"/>
<Setter Property="Margin" Value="5,0,5,5"/>
<Setter Property="Margin" Value="2,0,2,5"/>
<Setter Property="Padding" Value="2"/>
</Style>
<Style x:Key="CancelBuys" TargetType="Button" BasedOn="{StaticResource LadderMenuButton}">
@@ -244,8 +244,7 @@
Background="{mbts:BTSColor UI.Button.normal_background}"
Padding="{TemplateBinding Padding}"
SnapsToDevicePixels="True"
VerticalAlignment="Bottom"
Margin="0,0,0,12">
Margin="2,0,2,10">
<ContentPresenter
HorizontalAlignment="Center"
VerticalAlignment="Center"
@@ -267,28 +266,28 @@
</UserControl.Resources>
<AdornerDecorator>
<Grid x:Name="_root">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="112"/>
<ColumnDefinition Width="2"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid RowSpan="2" Background="{mbts:BTSColor UI.spark_menu_background}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="112"/>
<ColumnDefinition Width="2"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition/>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<StackPanel Margin="5,0">
<StackPanel.Resources>
<Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="HorizontalAlignment" Value="Stretch" />
</Style>
</StackPanel.Resources>
<Grid Margin="8,4,0,0">
<Grid.RowDefinitions>
<Grid RowSpan="2" Background="{mbts:BTSColor UI.spark_menu_background}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition/>
</Grid.RowDefinitions>
<StackPanel Margin="5,0">
<StackPanel.Resources>
<Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="HorizontalAlignment" Value="Stretch" />
</Style>
</StackPanel.Resources>
<Grid Margin="8,4,0,0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
@@ -297,16 +296,16 @@
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="6"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<!-- Day -->
<TextBlock Grid.Column="0" Grid.Row="0" Text="Day"
<!-- Day -->
<TextBlock Grid.Column="0" Grid.Row="0" Text="Day"
Margin="0,0,0,4"
Visibility="{Binding show_day, Converter={StaticResource BooleanToVisibilityConverter}}"/>
<TextBlock Grid.Column="2" Grid.Row="0" FontWeight="Bold"
<TextBlock Grid.Column="2" Grid.Row="0" FontWeight="Bold"
Margin="0,0,0,4"
Foreground="{Binding change, Converter={StaticResource NumericSignBrushConverter}}"
Visibility="{Binding show_day, Converter={StaticResource BooleanToVisibilityConverter}}">
@@ -317,11 +316,11 @@
</MultiBinding>
</TextBlock.Text>
</TextBlock>
<!-- High -->
<TextBlock Grid.Column="0" Grid.Row="1" Text="High"
<!-- High -->
<TextBlock Grid.Column="0" Grid.Row="1" Text="High"
Margin="0,0,0,4"
Visibility="{Binding show_high, Converter={StaticResource BooleanToVisibilityConverter}}"/>
<TextBlock Grid.Column="2" Grid.Row="1" Foreground="{mbts:BTSColor UI.default_text}" FontWeight="Bold"
<TextBlock Grid.Column="2" Grid.Row="1" Foreground="{mbts:BTSColor UI.default_text}" FontWeight="Bold"
Margin="0,0,0,4"
Visibility="{Binding show_high, Converter={StaticResource BooleanToVisibilityConverter}}">
<TextBlock.Text>
@@ -331,11 +330,11 @@
</MultiBinding>
</TextBlock.Text>
</TextBlock>
<!-- Low -->
<TextBlock Grid.Column="0" Grid.Row="2" Text="Low"
<!-- Low -->
<TextBlock Grid.Column="0" Grid.Row="2" Text="Low"
Margin="0,0,0,4"
Visibility="{Binding show_low, Converter={StaticResource BooleanToVisibilityConverter}}"/>
<TextBlock Grid.Column="2" Grid.Row="2" Foreground="{mbts:BTSColor UI.default_text}" FontWeight="Bold"
<TextBlock Grid.Column="2" Grid.Row="2" Foreground="{mbts:BTSColor UI.default_text}" FontWeight="Bold"
Margin="0,0,0,4"
Visibility="{Binding show_low, Converter={StaticResource BooleanToVisibilityConverter}}">
<TextBlock.Text>
@@ -345,11 +344,11 @@
</MultiBinding>
</TextBlock.Text>
</TextBlock>
<!-- Open -->
<TextBlock Grid.Column="0" Grid.Row="3" Text="Open"
<!-- Open -->
<TextBlock Grid.Column="0" Grid.Row="3" Text="Open"
Margin="0,0,0,4"
Visibility="{Binding show_open, Converter={StaticResource BooleanToVisibilityConverter}}"/>
<TextBlock Grid.Column="2" Grid.Row="3" FontWeight="Bold"
<TextBlock Grid.Column="2" Grid.Row="3" FontWeight="Bold"
Margin="0,0,0,4"
Visibility="{Binding show_open, Converter={StaticResource BooleanToVisibilityConverter}}">
<TextBlock.Text>
@@ -359,11 +358,11 @@
</MultiBinding>
</TextBlock.Text>
</TextBlock>
<!-- Settle -->
<TextBlock Grid.Column="0" Grid.Row="4" Text="Settle"
<!-- Settle -->
<TextBlock Grid.Column="0" Grid.Row="4" Text="Settle"
Margin="0,0,0,4"
Visibility="{Binding show_settle, Converter={StaticResource BooleanToVisibilityConverter}}"/>
<TextBlock Grid.Column="2" Grid.Row="4" FontWeight="Bold"
<TextBlock Grid.Column="2" Grid.Row="4" FontWeight="Bold"
Margin="0,0,0,4"
Visibility="{Binding show_settle, Converter={StaticResource BooleanToVisibilityConverter}}">
<TextBlock.Text>
@@ -373,22 +372,22 @@
</MultiBinding>
</TextBlock.Text>
</TextBlock>
<!-- Volume -->
<TextBlock Grid.Column="0" Grid.Row="5" Text="Volume"
<!-- Volume -->
<TextBlock Grid.Column="0" Grid.Row="5" Text="Volume"
Margin="0,0,0,4"
Visibility="{Binding show_volume, Converter={StaticResource BooleanToVisibilityConverter}}"/>
<TextBlock Grid.Column="2" Grid.Row="5" Text="{Binding volume, Mode=OneWay}" FontWeight="Bold"
<TextBlock Grid.Column="2" Grid.Row="5" Text="{Binding volume, Mode=OneWay}" FontWeight="Bold"
Margin="0,0,0,4"
Visibility="{Binding show_volume, Converter={StaticResource BooleanToVisibilityConverter}}"/>
</Grid>
<!-- Account combobox -->
<ComboBox DataContext="{Binding order_properties_vm}" Margin="2,10,2,2"
</Grid>
<!-- Account combobox -->
<ComboBox DataContext="{Binding order_properties_vm}" Margin="2,10,2,2"
ItemsSource="{Binding accounts}" SelectedItem="{Binding selected_account}"
Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}},
Path = DataContext.show_account,
Converter={StaticResource BooleanToVisibilityConverter}}"/>
<!-- TIF combobox-->
<ComboBox DataContext="{Binding order_properties_vm}" ItemsSource="{Binding time_in_forces}"
<!-- TIF combobox-->
<ComboBox DataContext="{Binding order_properties_vm}" ItemsSource="{Binding time_in_forces}"
SelectedItem="{Binding selected_time_in_force}" Margin="2"
Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}},
Path = DataContext.show_tif,
@@ -399,8 +398,8 @@
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
<!-- Order Type combobox -->
<uag:OrderDetailsPopupControl
<!-- Order Type combobox -->
<uag:OrderDetailsPopupControl
DataContext="{Binding order_properties_vm}"
Margin="2"
ExpandDirection="Left"
@@ -412,8 +411,8 @@
Path = DataContext.show_order_type,
Converter={StaticResource BooleanToVisibilityConverter}}"
/>
<!-- Position into qty button -->
<Button
<!-- Position into qty button -->
<Button
Margin="2"
Command="{Binding position_click_command}"
Content="{Binding position, Converter={StaticResource PositionTextConverter}}"
@@ -425,8 +424,8 @@
<TextBlock Text="{Binding order_properties_vm.selected_account, StringFormat='{}{0} total position (click to copy to size)'}"/>
</Button.ToolTip>
</Button>
<!-- Qty textbox -->
<TextBox
<!-- Qty textbox -->
<TextBox
mbts:TextBoxBehavior.InputFilter="{mbts:RegexInputFilter Regex={x:Static Member=Integer, MemberType={mbts:Nested txt:TextUtils.RegexFilters}}}"
mbts:TextBoxBehavior.IncrementDecrementOnMouseClick="True"
HorizontalContentAlignment="Right"
@@ -434,8 +433,8 @@
Text="{Binding size_calculator.value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
ContextMenu="{x:Null}"
/>
<!-- Qty quick buttons -->
<ItemsControl ItemsSource="{Binding size_calculator.buttons}" Focusable="False"
<!-- Qty quick buttons -->
<ItemsControl ItemsSource="{Binding size_calculator.buttons}" Focusable="False"
Visibility="{Binding show_size_preset, Converter={StaticResource BooleanToVisibilityConverter}}"
>
<ItemsControl.ItemsPanel>
@@ -449,38 +448,34 @@
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
<!-- Clear button -->
<Button Margin="2" HorizontalAlignment="Stretch" Command="{Binding size_calculator.clear}">Clear</Button>
<!-- Auto Clear button - reset to defaults after order -->
<CheckBox Margin="2" IsChecked="{Binding auto_clear}"
<!-- Clear button -->
<Button Margin="2" HorizontalAlignment="Stretch" Command="{Binding size_calculator.clear}">Clear</Button>
<!-- Auto Clear button - reset to defaults after order -->
<CheckBox Margin="2" IsChecked="{Binding auto_clear}"
Visibility="{Binding show_auto_clear, Converter={StaticResource BooleanToVisibilityConverter}}">
Auto Clear
</CheckBox>
</StackPanel>
<Grid Grid.Row="1">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition/>
</Grid.RowDefinitions>
<!-- Cancel Buttons -->
<StackPanel Margin="0,17,0,0" VerticalAlignment="Top">
<Button Command="{Binding cancel_command}" CommandParameter="Bids" Style="{StaticResource CancelBuys}"
<StackPanel Margin="0,17,0,0" VerticalAlignment="Top">
<!-- Cancel Buttons -->
<Button Command="{Binding cancel_command}" CommandParameter="Bids" Style="{StaticResource CancelBuys}"
Visibility="{Binding show_cancel_buys, Converter={StaticResource BooleanToVisibilityConverter}}"/>
<Button Command="{Binding cancel_command}" CommandParameter="Asks" Style="{StaticResource CancelSells}"
<Button Command="{Binding cancel_command}" CommandParameter="Asks" Style="{StaticResource CancelSells}"
Visibility="{Binding show_cancel_sells, Converter={StaticResource BooleanToVisibilityConverter}}"/>
<Button Command="{Binding cancel_command}" CommandParameter="All" Style="{StaticResource CancelAll}"
<Button Command="{Binding cancel_command}" CommandParameter="All" Style="{StaticResource CancelAll}"
Visibility="{Binding show_cancel_all, Converter={StaticResource BooleanToVisibilityConverter}}"/>
</StackPanel>
<StackPanel Grid.Row="1" Margin="0,17,0,0" VerticalAlignment="Bottom">
<!-- Settings Button -->
<Button Command="{Binding settings_command}" Style="{StaticResource SettingsButton}"/>
</StackPanel>
</StackPanel>
<!-- Settings Button -->
<Button Grid.Row="1" HorizontalContentAlignment="Stretch" Command="{Binding settings_command}" Style="{StaticResource SettingsButton}" />
</Grid>
</Grid>
<!-- Ladder Column Headers -->
<Border Grid.Column="2" HorizontalAlignment="Stretch">
<GridViewHeaderRowPresenter x:Name="_column_headers_presenter" AllowsColumnReorder="False"/>
</Border>
<!-- LadderGridHost -->
<spark:LadderGridHost x:Name="_ladder" Grid.Column="2" Grid.Row="1"
<!-- Ladder Column Headers -->
<Border Grid.Column="2" HorizontalAlignment="Stretch">
<GridViewHeaderRowPresenter x:Name="_column_headers_presenter" AllowsColumnReorder="False"/>
</Border>
<!-- LadderGridHost -->
<spark:LadderGridHost x:Name="_ladder" Grid.Column="2" Grid.Row="1"
Command="{Binding send_order_command}"
Orders="{Binding orders}">
<spark:LadderGridHost.Resources>
@@ -523,7 +518,7 @@
</Style>
</spark:LadderGridHost.Resources>
</spark:LadderGridHost>
<spark:RecenterCountdown Grid.Column="2" Grid.Row="1" Margin="0,0,18,0"
<spark:RecenterCountdown Grid.Column="2" Grid.Row="1" Margin="0,0,18,0"
VerticalAlignment="Bottom" HorizontalAlignment="Right"
Width="30" Height="30"
Mode="Pie" Delay="0:0:10"
@@ -539,14 +534,14 @@
<Pen Thickness="0" Brush="MediumPurple" />
</spark:RecenterCountdown.PieStroke>
</spark:RecenterCountdown>
<!-- Ladder Status message -->
<Button x:Name="_status" Grid.ColumnSpan="4" Grid.Row="1" VerticalAlignment="Bottom" HorizontalAlignment="Left" Command="{Binding status_click_command}">
<Button.Template>
<ControlTemplate>
<TextBlock Text="{Binding status_message}" Background="{Binding status_background}" Padding="5,0" />
</ControlTemplate>
</Button.Template>
</Button>
</Grid>
<!-- Ladder Status message -->
<Button x:Name="_status" Grid.ColumnSpan="4" Grid.Row="1" VerticalAlignment="Bottom" HorizontalAlignment="Left" Command="{Binding status_click_command}">
<Button.Template>
<ControlTemplate>
<TextBlock Text="{Binding status_message}" Background="{Binding status_background}" Padding="5,0" />
</ControlTemplate>
</Button.Template>
</Button>
</Grid>
</AdornerDecorator>
</UserControl>