From e23a2078b71dca67f60835fada4656eb316a5c80 Mon Sep 17 00:00:00 2001
From: SpoinkyNL <spoinky.nl@gmail.com>
Date: Thu, 17 Mar 2016 09:35:10 +0100
Subject: [PATCH] Fixed volume display selection. This closes #57 and #61

---
 .../Modules/Overlays/VolumeDisplay/VolumeDisplay.cs       | 4 ++--
 .../Modules/Overlays/VolumeDisplay/VolumeDisplayView.xaml | 8 +-------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplay.cs b/Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplay.cs
index 395a74070..4ac7ddac6 100644
--- a/Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplay.cs
+++ b/Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplay.cs
@@ -32,8 +32,8 @@ namespace Artemis.Modules.Overlays.VolumeDisplay
         {
             var volumeRect = new KeyboardRectangle(MainManager.KeyboardManager.ActiveKeyboard, 0, 0, new List<Color>
             {
-                ColorHelpers.ToDrawingColor(Settings.SecondaryColor),
-                ColorHelpers.ToDrawingColor(Settings.MainColor)
+                ColorHelpers.ToDrawingColor(Settings.MainColor),
+                ColorHelpers.ToDrawingColor(Settings.SecondaryColor)
             },
                 LinearGradientMode.Horizontal)
             {
diff --git a/Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplayView.xaml b/Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplayView.xaml
index 9a1645084..bfa1cef00 100644
--- a/Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplayView.xaml
+++ b/Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplayView.xaml
@@ -55,13 +55,7 @@
             <xctk:ColorPicker x:Name="SecondaryColor"
                               SelectedColor="{Binding Path=VolumeDisplaySettings.SecondaryColor, Mode=TwoWay}"
                               Grid.Row="2" Grid.Column="1" Width="110" HorizontalAlignment="Right"
-                              VerticalAlignment="Center" Margin="0,5,-1,5" Height="22">
-                <xctk:ColorPicker.Template>
-                    <ControlTemplate>
-                        <Rectangle />
-                    </ControlTemplate>
-                </xctk:ColorPicker.Template>
-            </xctk:ColorPicker>
+                              VerticalAlignment="Center" Margin="0,5,-1,5" Height="22" />
 
             <TextBlock Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" Margin="0,8"
                        TextWrapping="Wrap" HorizontalAlignment="Left" FontFamily="Segoe UI Semibold"