From 9336e60c33d932e9a5881ad9d3cc660e7cfbc789 Mon Sep 17 00:00:00 2001
From: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date: Wed, 26 Oct 2022 17:02:06 +0200
Subject: [PATCH] minor adjustments

---
 examples/iotdashboard/CircularProgressBar.cpp |  1 -
 examples/iotdashboard/LightDisplay.cpp        |  4 ++--
 examples/iotdashboard/LightDisplaySkinlet.cpp | 16 ++++++++--------
 examples/iotdashboard/Skin.cpp                |  2 +-
 examples/iotdashboard/Skin.h                  |  8 ++++----
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/examples/iotdashboard/CircularProgressBar.cpp b/examples/iotdashboard/CircularProgressBar.cpp
index 91578197..9d23790b 100644
--- a/examples/iotdashboard/CircularProgressBar.cpp
+++ b/examples/iotdashboard/CircularProgressBar.cpp
@@ -6,7 +6,6 @@
 #include "CircularProgressBar.h"
 
 #include <QskAnimator.h>
-#include <QskArcMetrics.h>
 #include <QskFunctions.h>
 
 QSK_SUBCONTROL( CircularProgressBar, Groove )
diff --git a/examples/iotdashboard/LightDisplay.cpp b/examples/iotdashboard/LightDisplay.cpp
index 7c345a11..25a6f24f 100644
--- a/examples/iotdashboard/LightDisplay.cpp
+++ b/examples/iotdashboard/LightDisplay.cpp
@@ -117,7 +117,7 @@ void LightDisplay::mouseMoveEvent( QMouseEvent* event )
         return;
     }
 
-    const QskArcMetrics metrics = arcMetricsHint( ColdAndWarmArc );
+    const auto metrics = arcMetricsHint( ColdAndWarmArc );
     qreal angle = angleFromPoint( rect, mousePos );
 
     const int tolerance = 20;
@@ -161,7 +161,7 @@ bool LightDisplay::arcContainsPoint( const QRectF& rect, const QPointF& point )
     // putting this in an own function just because it might be useful
     // at other places in the future
 
-    const QskArcMetrics metrics = arcMetricsHint( ColdAndWarmArc );
+    const auto metrics = arcMetricsHint( ColdAndWarmArc );
     const int tolerance = 20;
 
     // 1. check angle
diff --git a/examples/iotdashboard/LightDisplaySkinlet.cpp b/examples/iotdashboard/LightDisplaySkinlet.cpp
index 2a4a7f3e..27760636 100644
--- a/examples/iotdashboard/LightDisplaySkinlet.cpp
+++ b/examples/iotdashboard/LightDisplaySkinlet.cpp
@@ -37,8 +37,8 @@ QRectF LightDisplaySkinlet::subControlRect( const QskSkinnable* skinnable,
 
     if( subControl == LightDisplay::Groove || subControl == LightDisplay::Panel )
     {
-        QSizeF textSize = textLabelsSize( display );
-        QskArcMetrics arcMetrics = display->arcMetricsHint( LightDisplay::ColdAndWarmArc );
+        const auto textSize = textLabelsSize( display );
+        const auto arcMetrics = display->arcMetricsHint( LightDisplay::ColdAndWarmArc );
         const qreal ticksWidth = display->arcMetricsHint( LightDisplay::Tickmarks ).width() + ticksSpacing;
 
         const qreal x = textSize.width() + arcMetrics.width() + ticksWidth;
@@ -81,7 +81,7 @@ QRectF LightDisplaySkinlet::subControlRect( const QskSkinnable* skinnable,
     else if( subControl == LightDisplay::LeftLabel )
     {
         const QRectF ticksRect = subControlRect( skinnable, contentsRect, LightDisplay::Tickmarks );
-        QSizeF size = textLabelsSize( display );
+        const auto size = textLabelsSize( display );
 
         rect.setWidth( size.width() );
 
@@ -92,8 +92,8 @@ QRectF LightDisplaySkinlet::subControlRect( const QskSkinnable* skinnable,
     }
     else if( subControl == LightDisplay::RightLabel )
     {
-        QRectF ticksRect = subControlRect( skinnable, contentsRect, LightDisplay::Tickmarks );
-        QSizeF size = textLabelsSize( display );
+        const auto ticksRect = subControlRect( skinnable, contentsRect, LightDisplay::Tickmarks );
+        const auto size = textLabelsSize( display );
 
         rect.setX( ticksRect.x() + ticksRect.width() );
 
@@ -104,9 +104,9 @@ QRectF LightDisplaySkinlet::subControlRect( const QskSkinnable* skinnable,
     }
     else if( subControl == LightDisplay::Knob )
     {
-        QRectF arcRect = subControlRect( skinnable, contentsRect, LightDisplay::ColdAndWarmArc );
-        QskArcMetrics arcMetrics = display->arcMetricsHint( LightDisplay::ColdAndWarmArc );
-        QSizeF knobSize = display->strutSizeHint( LightDisplay::Knob );
+        const auto arcRect = subControlRect( skinnable, contentsRect, LightDisplay::ColdAndWarmArc );
+        const auto arcMetrics = display->arcMetricsHint( LightDisplay::ColdAndWarmArc );
+        const auto knobSize = display->strutSizeHint( LightDisplay::Knob );
 
         const qreal radius = ( arcRect.width() - arcMetrics.width() ) / 2;
         const qreal angle = display->valueAsRatio() * 180;
diff --git a/examples/iotdashboard/Skin.cpp b/examples/iotdashboard/Skin.cpp
index 32bb9c7e..0cdc82eb 100644
--- a/examples/iotdashboard/Skin.cpp
+++ b/examples/iotdashboard/Skin.cpp
@@ -218,7 +218,7 @@ void Skin::initHints( const Palette& palette )
     ed.setGradient( MenuBar::Panel, palette.menuBar );
     ed.setGradient( DashboardPage::Panel, palette.mainContent );
 
-    ed.setColor( Box::Panel, palette.box.startColor() );
+    ed.setColor( Box::Panel, palette.box );
     QskShadowMetrics shadowMetrics( 0, 10 );
     ed.setShadowMetrics( Box::Panel, shadowMetrics );
     ed.setShadowColor( Box::Panel, palette.shadow );
diff --git a/examples/iotdashboard/Skin.h b/examples/iotdashboard/Skin.h
index 636425ad..d2955092 100644
--- a/examples/iotdashboard/Skin.h
+++ b/examples/iotdashboard/Skin.h
@@ -13,10 +13,10 @@ class Skin : public QskSkin
   public:
     struct Palette
     {
-        QskGradient menuBar;
-        QskGradient mainContent;
-        QskGradient box;
-        QskGradient roundButton;
+        QColor menuBar;
+        QColor mainContent;
+        QColor box;
+        QColor roundButton;
         QColor weekdayBox;
         QColor text;
         QColor shadow;