Merge branch 'mika-n-jay' into jay

This commit is contained in:
Travis Nickles 2020-01-19 20:13:04 -06:00
commit 2bc2e60faf

View File

@ -249,7 +249,7 @@
<StackPanel Orientation="Horizontal" Margin="8,0,0,0"
IsEnabled="{Binding FlashHighLatency,FallbackValue='False'}">
<!--<TextBox Text="20" VerticalContentAlignment="Center" />-->
<xctk:IntegerUpDown d:IsHidden="True" Value="20" MinWidth="30" ButtonSpinnerLocation="Right" Increment="1" Maximum="100" Minimum="10" />
<xctk:IntegerUpDown d:IsHidden="True" Value="{Binding FlashHighLatencyAt}" MinWidth="30" ButtonSpinnerLocation="Right" Increment="1" Maximum="100" Minimum="10" />
<Label Content="ms" />
</StackPanel>
</StackPanel>