From 8bc7146de027a74e04a521f8700412220dd7cce1 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Tue, 3 Sep 2024 08:14:41 +0200 Subject: [PATCH] wip --- examples/iotdashboard/DashboardPage.cpp | 11 ----------- examples/iotdashboard/LightDisplay.cpp | 11 ----------- examples/iotdashboard/LightDisplay.h | 9 --------- examples/iotdashboard/Skin.cpp | 5 ++--- examples/iotdashboard/Skin.h | 1 - 5 files changed, 2 insertions(+), 35 deletions(-) diff --git a/examples/iotdashboard/DashboardPage.cpp b/examples/iotdashboard/DashboardPage.cpp index a91291bf..3c7f5028 100644 --- a/examples/iotdashboard/DashboardPage.cpp +++ b/examples/iotdashboard/DashboardPage.cpp @@ -14,17 +14,6 @@ #include "TopBar.h" #include "UsageBox.h" -#include -#include -#include -#include -#include -#include -#include -#include - -#include - QSK_SUBCONTROL( DashboardPage, Panel ) namespace diff --git a/examples/iotdashboard/LightDisplay.cpp b/examples/iotdashboard/LightDisplay.cpp index 9f305b51..8ef43ea3 100644 --- a/examples/iotdashboard/LightDisplay.cpp +++ b/examples/iotdashboard/LightDisplay.cpp @@ -51,17 +51,6 @@ bool LightDisplay::isPressed() const return hasSkinState( Pressed ); } -void LightDisplay::setGradient( const QskGradient& gradient ) -{ - m_gradient = gradient; - update(); -} - -const QskGradient& LightDisplay::gradient() const -{ - return m_gradient; -} - void LightDisplay::mousePressEvent( QMouseEvent* event ) { QRectF handleRect = subControlRect( LightDisplay::Knob ); diff --git a/examples/iotdashboard/LightDisplay.h b/examples/iotdashboard/LightDisplay.h index bddd5f47..8c7728a5 100644 --- a/examples/iotdashboard/LightDisplay.h +++ b/examples/iotdashboard/LightDisplay.h @@ -6,7 +6,6 @@ #pragma once #include -#include #include class LightDisplay : public QskBoundedValueInput @@ -22,9 +21,6 @@ class LightDisplay : public QskBoundedValueInput bool isPressed() const; - void setGradient( const QskGradient& ); - const QskGradient& gradient() const; - protected: void mousePressEvent( QMouseEvent* e ) override; void mouseMoveEvent( QMouseEvent* e ) override; @@ -33,9 +29,4 @@ class LightDisplay : public QskBoundedValueInput private: qreal angleFromPoint( const QRectF&, const QPointF& ) const; bool arcContainsPoint( const QRectF&, const QPointF& ) const; - - QskShadowMetrics m_shadow; - QColor m_shadowColor = Qt::black; - - QskGradient m_gradient; }; diff --git a/examples/iotdashboard/Skin.cpp b/examples/iotdashboard/Skin.cpp index 5e7b56e3..d3e9dbaf 100644 --- a/examples/iotdashboard/Skin.cpp +++ b/examples/iotdashboard/Skin.cpp @@ -322,7 +322,7 @@ Skin::Palette Skin::palette( QskSkin::ColorScheme colorScheme ) const Qt::white, 0xff4a4a4a, 0xff555555, - { { { 0.0, 0xff991100 }, { 0.2, 0xff9a7a57 }, { 0.5, 0xff3726af }, { 1.0, Qt::black } } }, + { { { 0.0, 0xff991100 }, { 0.4, 0xff9a7a57 }, { 1.0, 0xff3726af } } }, 0x10ffffff, 0xff222222 }; @@ -339,8 +339,7 @@ Skin::Palette Skin::palette( QskSkin::ColorScheme colorScheme ) const Qt::black, 0xffe5e5e5, 0xffc4c4c4, - { { { 0.0, 0xffff3122 }, { 0.2, 0xfffeeeb7 }, { 0.3, 0xffa7b0ff }, { 0.5, 0xff6776ff }, - { 1.0, Qt::black } } }, + { { { 0.0, 0xffff3122 }, { 0.4, 0xfffeeeb7 }, { 0.6, 0xffa7b0ff }, { 1.0, 0xff6776ff } } }, 0x10000000, 0xffdddddd }; diff --git a/examples/iotdashboard/Skin.h b/examples/iotdashboard/Skin.h index 1b2cd7f1..1a06c446 100644 --- a/examples/iotdashboard/Skin.h +++ b/examples/iotdashboard/Skin.h @@ -34,5 +34,4 @@ class Skin : public QskSkin void initHints() override; Palette palette( ColorScheme ) const; - void initHints( const Palette& ); };