From 7cbd5d8cb85929219ecd789602a3bf741c957ce8 Mon Sep 17 00:00:00 2001
From: Peter Hartmann <peter@edelhirsch.io>
Date: Wed, 15 Dec 2021 15:52:17 +0100
Subject: [PATCH] Revert "We don't need this commit either"

This reverts commit 2dc38064f7fee1d0505262fe5cebcf9e1fb16cea.
---
 src/nodes/QskBoxRendererColorMap.h  | 28 +++++++---------------------
 src/nodes/QskBoxRendererEllipse.cpp |  6 +++---
 src/nodes/QskBoxRendererRect.cpp    |  2 +-
 3 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/src/nodes/QskBoxRendererColorMap.h b/src/nodes/QskBoxRendererColorMap.h
index 757a8de6..b6749b6b 100644
--- a/src/nodes/QskBoxRendererColorMap.h
+++ b/src/nodes/QskBoxRendererColorMap.h
@@ -44,34 +44,20 @@ namespace QskVertex
     class ColorMapGradient
     {
       public:
-        inline ColorMapGradient( const QskGradient& gradient )
-            : m_gradient( gradient )
+        inline ColorMapGradient( Color color1, Color color2 )
+            : m_color1( color1 )
+            , m_color2( color2 )
         {
         }
 
-        inline Color colorAt( qreal ratio ) const
+        inline Color colorAt( qreal value ) const
         {
-            const auto stops = m_gradient.stops();
-
-            for( int i = 0; i < m_gradient.stopCount(); ++i )
-            {
-                const QskGradientStop stop = stops.at( i );
-
-                if( stop.position() >= ratio )
-                {
-                    const int start = ( i == 0 ) ? 0 : i - 1;
-                    const int end = ( i == 0 ) ? 1 : i;
-                    const QColor color = QskGradientStop::interpolated( stops.at( start ),
-                                                                        stops.at( end ), ratio );
-                    return Color( color );
-                }
-            }
-
-            return Color();
+            return m_color1.interpolatedTo( m_color2, value );
         }
 
       private:
-        const QskGradient m_gradient;
+        const Color m_color1;
+        const Color m_color2;
     };
 
     class ColorIterator
diff --git a/src/nodes/QskBoxRendererEllipse.cpp b/src/nodes/QskBoxRendererEllipse.cpp
index a30562dc..d5ee3563 100644
--- a/src/nodes/QskBoxRendererEllipse.cpp
+++ b/src/nodes/QskBoxRendererEllipse.cpp
@@ -902,7 +902,7 @@ static inline void qskRenderFillRandom(
     }
     else
     {
-        const ColorMapGradient map( gradient );
+        const ColorMapGradient map( gradient.startColor(), gradient.endColor() );
         qskRenderFillLines( metrics, orientation, line, map );
     }
 }
@@ -926,7 +926,7 @@ static inline void qskRenderBoxRandom(
         {
             const auto orientation = qskQtOrientation( gradient );
 
-            const ColorMapGradient fillMap( gradient );
+            const ColorMapGradient fillMap( gradient.startColor(), gradient.endColor() );
             qskRenderLines( metrics, orientation, borderLine, borderMap, fillLine, fillMap );
         }
     }
@@ -948,7 +948,7 @@ static inline void qskRenderBoxRandom(
         {
             const auto orientation = qskQtOrientation( gradient );
 
-            const ColorMapGradient fillMap( gradient );
+            const ColorMapGradient fillMap( gradient.startColor(), gradient.endColor() );
             qskRenderLines( metrics, orientation, borderLine, tl, tr, bl, br, fillLine, fillMap );
         }
     }
diff --git a/src/nodes/QskBoxRendererRect.cpp b/src/nodes/QskBoxRendererRect.cpp
index e0ae67f7..5b72c6b2 100644
--- a/src/nodes/QskBoxRendererRect.cpp
+++ b/src/nodes/QskBoxRendererRect.cpp
@@ -604,7 +604,7 @@ void QskBoxRenderer::renderRect(
 
             if ( fillRandom )
             {
-                const ColorMapGradient colorMap( { Qt::Vertical, gd.startColor(), gd.endColor() } );
+                const ColorMapGradient colorMap( gd.startColor(), gd.endColor() );
                 qskCreateFillRandom( gd.orientation(), in, colorMap, line );
             }
             else