sigonasr2/SMX_PGE
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Put the step color widgets in a StackPanel.

Browse Source 
Doing this in a separate commit since it changes a lot of indentation but
doesn't really change much code.
This commit is contained in:
Glenn Maynard 2018-11-08 16:36:25 -06:00
parent 2628c078fa
commit e5e75e0106
1 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
smx-config/MainWindow.xaml
View File

@ -664,17 +664,14 @@ Use if the platform is too sensitive.</clr:String>
<Separator Margin="0,10,0,4" /> <Separator Margin="0,10,0,4" />
<TextBlock HorizontalAlignment="Center" Margin="0,15,0,0" VerticalAlignment="Top" <StackPanel
TextAlignment="Center" Visibility="Visible"
xml:space="preserve" FontSize="16">Panel colors</TextBlock> Name="ColorPickerGroup" HorizontalAlignment="Center" Orientation="Vertical">
<TextBlock TextAlignment="Center">
<TextBlock DockPanel.Dock="Top" HorizontalAlignment="Center" Margin="0,15,0,10" VerticalAlignment="Top" Set the color each arrow lights when pressed.
TextAlignment="Center" </TextBlock>
xml:space="preserve"
>Set the color each arrow lights when pressed.</TextBlock>
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal"> <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
<!-- The duplication here could be factored out, but with WPF it's not really worth it: --> <!-- The duplication here could be factored out, but with WPF it's not really worth it: -->
<Grid x:Name="PanelColorP1" Background="#FFE5E5E5" Width="100" Height="100" HorizontalAlignment="Center" VerticalAlignment="Top"> <Grid x:Name="PanelColorP1" Background="#FFE5E5E5" Width="100" Height="100" HorizontalAlignment="Center" VerticalAlignment="Top">
<controls:PanelColorButton Panel="0" Content="↖" Margin="-60,-50,0,0" SelectedPanel="{Binding Path=SelectedPanel, Mode=TwoWay, ElementName=AutoLightsColor}" /> <controls:PanelColorButton Panel="0" Content="↖" Margin="-60,-50,0,0" SelectedPanel="{Binding Path=SelectedPanel, Mode=TwoWay, ElementName=AutoLightsColor}" />
@ -712,6 +709,7 @@ Use if the platform is too sensitive.</clr:String>
<Button x:Name="SetAllPanelsToCurrentColor" Content="Set all panels to this color" HorizontalAlignment="Center" Padding="6,2" Margin="0,6,0,0" /> <Button x:Name="SetAllPanelsToCurrentColor" Content="Set all panels to this color" HorizontalAlignment="Center" Padding="6,2" Margin="0,6,0,0" />
</StackPanel> </StackPanel>
</StackPanel>
<!-- This version label is tweaked so it's in the same place as the one on the <!-- This version label is tweaked so it's in the same place as the one on the
connecting screen. If we use the same margin, the tab container's border connecting screen. If we use the same margin, the tab container's border