Skip to content

Commit

Permalink
Added new version of ColorPicker. Added apply button.
Browse files Browse the repository at this point in the history
  • Loading branch information
chrizonix committed Feb 6, 2017
1 parent 57feefd commit 04beb0a
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 2 deletions.
Binary file modified ScpSettings/ColorPicker.dll
Binary file not shown.
Binary file modified ScpSettings/ColorPickerControls.dll
Binary file not shown.
3 changes: 2 additions & 1 deletion ScpSettings/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,7 @@
<customControls:ColorChooserControl
ColorText="Dying"
Ds4BatteryColor="{Binding Path=Ds4ColorDying, Mode=TwoWay}" />
<Button Margin="5" Click="ApplyButton_Click" >Apply</Button>
</StackPanel>
</GroupBox>

Expand Down Expand Up @@ -506,4 +507,4 @@
</controls:AccordionItem>
</controls:Accordion>
</Grid>
</Window>
</Window>
10 changes: 9 additions & 1 deletion ScpSettings/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -184,5 +184,13 @@ private void XInputModToggleButton_Unchecked(object sender, RoutedEventArgs e)
}

#endregion

private void ApplyButton_Click(object sender, RoutedEventArgs e)
{
if (!_proxy.IsActive || _config == null)
return;

_proxy.WriteConfig(_config);
}
}
}
}

0 comments on commit 04beb0a

Please sign in to comment.