Merge branch 'jay' of https://github.com/SteelShot/DS4Windows into SteelShot-jay

This commit is contained in:
Travis Nickles 2020-04-12 10:31:18 -05:00
commit 89596d1f0a

View File

@ -256,7 +256,7 @@
</StackPanel> </StackPanel>
<CheckBox Content="{lex:Loc StartMinimized}" Margin="{StaticResource spaceMargin}" <CheckBox Content="{lex:Loc StartMinimized}" Margin="{StaticResource spaceMargin}"
IsChecked="{Binding StartMinimize}" /> IsChecked="{Binding StartMinimize}" />
<CheckBox Content="Minimize to Taskbar" Margin="{StaticResource spaceMargin}" <CheckBox Content="Minimize to Taskbar instead of System Tray" Margin="{StaticResource spaceMargin}"
IsChecked="{Binding MinimizeToTaskbar}" /> IsChecked="{Binding MinimizeToTaskbar}" />
<CheckBox Content="{lex:Loc CloseMinimizes}" Margin="{StaticResource spaceMargin}" <CheckBox Content="{lex:Loc CloseMinimizes}" Margin="{StaticResource spaceMargin}"
IsChecked="{Binding CloseMinimizes}" IsChecked="{Binding CloseMinimizes}"