From d1994e702e63189980bbee8750ed4571eb7108ef Mon Sep 17 00:00:00 2001
From: Steve Daulton <Stevethefiddle@users.noreply.github.com>
Date: Tue, 19 May 2015 02:57:08 +0100
Subject: [PATCH] Remove spectral selection edges when not in spectral
 selection.

---
 src/TrackArtist.cpp | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/TrackArtist.cpp b/src/TrackArtist.cpp
index 1453ba4e8..fa080fed8 100644
--- a/src/TrackArtist.cpp
+++ b/src/TrackArtist.cpp
@@ -1806,28 +1806,22 @@ static float sumFreqValues(
 AColor::ColorGradientChoice ChooseColorSet( float bin0, float bin1, float selBinLo, 
    float selBinCenter, float selBinHi, int dashCount, bool isSpectral )
 {
-   if ( (selBinCenter >= 0) && (bin0 <= selBinCenter) && (selBinCenter < bin1) )
+   if (!isSpectral)
+      return  AColor::ColorGradientTimeSelected;
+   if ((selBinCenter >= 0) && (bin0 <= selBinCenter) &&
+       (selBinCenter < bin1))
       return AColor::ColorGradientEdge;
-   else if (
-      (0 == dashCount % 2)    &&
-      (((selBinLo >= 0) && (bin0 <= selBinLo) && ( selBinLo < bin1))  ||
-       ((selBinHi >= 0) && (bin0 <= selBinHi) && ( selBinHi < bin1)) ) )
+   if ((0 == dashCount % 2) &&
+       (((selBinLo >= 0) && (bin0 <= selBinLo) && ( selBinLo < bin1))  ||
+        ((selBinHi >= 0) && (bin0 <= selBinHi) && ( selBinHi < bin1))))
       return AColor::ColorGradientEdge;
-   else if (
-      (selBinLo < 0 || selBinLo < bin1) && 
-      (selBinHi < 0 || selBinHi > bin0) )
-      if (isSpectral) {
-         return  AColor::ColorGradientTimeAndFrequencySelected;
-      }
-      else {
-         return  AColor::ColorGradientTimeSelected;
-      }
-   else
+   if ((selBinLo < 0 || selBinLo < bin1) && (selBinHi < 0 || selBinHi > bin0))
+      return  AColor::ColorGradientTimeAndFrequencySelected;
+
       return  AColor::ColorGradientTimeSelected;
 }
 
 
-
 void TrackArtist::DrawClipSpectrum(WaveTrackCache &cache,
                                    WaveClip *clip,
                                    wxDC & dc,