Merge branch 'master' into features/arcrenderer

added

playground/shadows/ArcPage.cpp

@@ -8,6 +8,7 @@
 #include "Slider.h"
 
 #include <QskGridBox.h>
+#include <QskRgbValue.h>
 
 namespace
 {
@@ -41,36 +42,11 @@ namespace
                 addItem( slider, 1, 0 );
             }
             {
-                auto slider = new Slider( "Border", 0, 10, 1, arc->borderWidth() );
+                auto slider = new Slider( "Border", 0, 50, 1, arc->borderWidth() );
                 connect( slider, &Slider::valueChanged, arc, &ShadowedArc::setBorderWidth );
 
                 addItem( slider, 1, 1);
             }
-            {
-                auto slider = new Slider( "Spread Radius", -10, 50, 1, arc->spreadRadius() );
-                connect( slider, &Slider::valueChanged, arc, &ShadowedArc::setSpreadRadius );
-
-                addItem( slider, 2, 0 );
-            }
-            {
-                auto slider = new Slider( "Blur Radius", 0, 50, 1, arc->blurRadius() );
-                connect( slider, &Slider::valueChanged, arc, &ShadowedArc::setBlurRadius );
-
-                addItem( slider, 2, 1 );
-            }
-            {
-                auto slider = new Slider( "Offset X", -50, 50, 1, arc->offsetX() );
-                connect( slider, &Slider::valueChanged, arc, &ShadowedArc::setOffsetX );
-
-                addItem( slider, 3, 0 );
-
-            }
-            {
-                auto slider = new Slider( "Offset Y", -50, 50, 1, arc->offsetY() );
-                connect( slider, &Slider::valueChanged, arc, &ShadowedArc::setOffsetY );
-
-                addItem( slider, 3, 1 );
-            }
         }
     };
 
@@ -79,20 +55,48 @@ namespace
       public:
         Arc()
         {
+            setBackgroundColor( QskRgb::LemonChiffon );
+            setClip( true ); // for testing if the arc stays inside its bounding rectangle
+
             setStartAngle( 45.0 );
             setSpanAngle( 270.0 );
-            setThickness( 10.0 );
+            setThickness( 30.0 );
 
-            setFillGradient( Qt::darkRed );
+            setBorderWidth( 5.0 );
+            setBorderColor( QColor( 0, 0, 0, 150 ) );
 
-            setBorderWidth( 0 );
+#if 0
-            setBorderColor( Qt::darkYellow );
+            const QskGradientStops stops =
+            {
+                { 0.1, Qt::darkRed  },
+                { 0.1, Qt::darkYellow },
+                { 0.5, Qt::darkYellow },
+                { 0.5, Qt::darkBlue },
+                { 0.75, Qt::darkBlue },
+                { 0.75, Qt::darkRed }
+            };
+#endif
+#if 0
+            const QskGradientStops stops =
+            {
+                { 0.1, Qt::darkRed  },
+                { 0.5, Qt::darkYellow },
+                { 0.75, Qt::darkBlue },
+                { 1.0, Qt::darkRed }
+            };
+#endif
+#if 1
+            QskGradientStops stops;
+            for ( int i = 0; i < 100; i++ )
+            {
+                const auto pos = i * 1.0 / 100;
 
-            setShadowColor( Qt::black );
+                stops += { pos, ( i % 2 ) ? Qt::darkRed : Qt::darkBlue };
-            setSpreadRadius( 0.0 );
+                stops += { pos, ( i % 2 ) ? Qt::darkBlue : Qt::darkRed };
-            setBlurRadius( 4.0 );
+            }
-            setOffsetX( 2.0 );
+#endif
-            setOffsetY( 2.0 );
+
+            setFillGradient( stops );
         }
     };
 }
@@ -101,7 +105,6 @@ ArcPage::ArcPage( QQuickItem* parent )
     : QskLinearBox( Qt::Vertical, parent )
 {
     auto arc = new Arc();
-    arc->setMargins( 40 ); // some extra space for testing the offsets
 
     auto panel = new ControlPanel( arc );
     panel->setSizePolicy( Qt::Vertical, QskSizePolicy::Fixed );

playground/shadows/ShadowedArc.cpp

@@ -130,14 +130,14 @@ ShadowedArc::ShadowedArc( QQuickItem* parent )
 
     // initial settings
 
-    setArcMetrics( { 0.0, 360.0, 1.0, Qt::RelativeSize } );
+    setArcMetrics( { 0.0, 360.0, 1.0, Qt::AbsoluteSize } );
 
     setFillGradient( Qt::darkRed );
 
     setBorderWidth( 0 );
     setBorderColor( Qt::gray );
 
-    setShadowColor( Qt::black );
+    setShadowColor( QColor() );
     setShadowMetrics( { 0, 0, QPointF( 0, 0 ), Qt::AbsoluteSize } );
 }