From 68ee161d9801c6fe53e57ea0c46a4db1e474563a Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Wed, 7 Apr 2021 17:37:05 +0200 Subject: [PATCH] remove QskShadowedRectangle We are not using it --- .../iot-dashboard/QskShadowedRectangle.cpp | 7 -- examples/iot-dashboard/QskShadowedRectangle.h | 51 --------------- .../QskShadowedRectangleSkinlet.cpp | 64 ------------------- .../QskShadowedRectangleSkinlet.h | 39 ----------- examples/iot-dashboard/Skin.cpp | 3 - examples/iot-dashboard/iot-dashboard.pro | 4 -- 6 files changed, 168 deletions(-) delete mode 100644 examples/iot-dashboard/QskShadowedRectangle.cpp delete mode 100644 examples/iot-dashboard/QskShadowedRectangle.h delete mode 100644 examples/iot-dashboard/QskShadowedRectangleSkinlet.cpp delete mode 100644 examples/iot-dashboard/QskShadowedRectangleSkinlet.h diff --git a/examples/iot-dashboard/QskShadowedRectangle.cpp b/examples/iot-dashboard/QskShadowedRectangle.cpp deleted file mode 100644 index 4ccce0cd..00000000 --- a/examples/iot-dashboard/QskShadowedRectangle.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "QskShadowedRectangle.h" - -QSK_SUBCONTROL( QskShadowedRectangle, Shadow ) - -QskShadowedRectangle::QskShadowedRectangle( QQuickItem* parent ) : QskControl( parent ) -{ -} diff --git a/examples/iot-dashboard/QskShadowedRectangle.h b/examples/iot-dashboard/QskShadowedRectangle.h deleted file mode 100644 index 7c63d0f2..00000000 --- a/examples/iot-dashboard/QskShadowedRectangle.h +++ /dev/null @@ -1,51 +0,0 @@ -#ifndef QSKSHADOWEDRECTANGLE_H -#define QSKSHADOWEDRECTANGLE_H - -#include "src/shadowedrectangle.h" - -#include - -class QskShadowedRectangle : public QskControl -{ - Q_OBJECT - - public: - QSK_SUBCONTROLS( Shadow ) - - QskShadowedRectangle( QQuickItem* parent = nullptr ); -// ~QskShadowedRectangle() override; - -// BorderGroup* border() const; -// ShadowGroup* shadow() const; -// CornersGroup* corners() const; - -// qreal radius() const; -// void setRadius( qreal newRadius ); -// Q_SIGNAL void radiusChanged(); - -// QColor color() const; -// void setColor( const QColor& newColor ); -// Q_SIGNAL void colorChanged(); - -// void componentComplete() override; - -// bool isSoftwareRendering() const; - -// Q_SIGNALS: -// void softwareRenderingChanged(); - -// protected: -// PaintedRectangleItem* softwareItem() const; -// void itemChange( QQuickItem::ItemChange change, const QQuickItem::ItemChangeData& value ) override; - -// private: -// void checkSoftwareItem(); -// const std::unique_ptr m_border; -// const std::unique_ptr m_shadow; -// const std::unique_ptr m_corners; -// qreal m_radius = 0.0; -// QColor m_color = Qt::white; -// PaintedRectangleItem* m_softwareItem = nullptr; -}; - -#endif // QSKSHADOWEDRECTANGLE_H diff --git a/examples/iot-dashboard/QskShadowedRectangleSkinlet.cpp b/examples/iot-dashboard/QskShadowedRectangleSkinlet.cpp deleted file mode 100644 index 3f32d042..00000000 --- a/examples/iot-dashboard/QskShadowedRectangleSkinlet.cpp +++ /dev/null @@ -1,64 +0,0 @@ -#include "QskShadowedRectangleSkinlet.h" -#include "QskShadowedRectangle.h" - -#include "src/scenegraph/shadowedrectanglenode.h" - -QskShadowedRectangleSkinlet::QskShadowedRectangleSkinlet( QskSkin* skin ) : QskSkinlet( skin ) - , m_border( new BorderGroup ) - , m_shadow( new ShadowGroup ) - , m_corners( new CornersGroup ) -{ - setNodeRoles( { ShadowRole } ); -} - -QRectF QskShadowedRectangleSkinlet::subControlRect( const QskSkinnable*, const QRectF& contentsRect, QskAspect::Subcontrol ) const -{ - return contentsRect; -} - -QSGNode* QskShadowedRectangleSkinlet::updateSubNode( const QskSkinnable* skinnable, quint8 nodeRole, QSGNode* node ) const -{ - const auto rectangle = static_cast< const QskShadowedRectangle* >( skinnable ); - - switch( nodeRole ) - { - case ShadowRole: - return updateShadowNode( rectangle, node ); - - default: - return nullptr; - } -} - -QSGNode* QskShadowedRectangleSkinlet::updateShadowNode( const QskShadowedRectangle* /*rectangle*/, QSGNode* node ) const -{ - auto shadowNode = static_cast( node ); - - if( !shadowNode ) - { - shadowNode = new ShadowedRectangleNode{}; - } - -// shadowNode->setBorderEnabled( m_border->isEnabled() ); -// shadowNode->setRect( rectangle->contentsRect() ); -// shadowNode->setSize( m_shadow->size() ); -// shadowNode->setRadius( m_corners->toVector4D( m_radius ) ); -// shadowNode->setOffset( QVector2D{float( m_shadow->xOffset() ), float( m_shadow->yOffset() )} ); -// shadowNode->setColor( m_color ); -// shadowNode->setShadowColor( m_shadow->color() ); -// shadowNode->setBorderWidth( m_border->width() ); -// shadowNode->setBorderColor( m_border->color() ); -// shadowNode->updateGeometry(); - - shadowNode->setBorderEnabled( true ); - shadowNode->setRect( {0, 0, 100, 50} ); - shadowNode->setSize( 50 ); - shadowNode->setRadius( m_corners->toVector4D( 5 ) ); - shadowNode->setOffset( QVector2D{float( 1 ), float( 1 )} ); - shadowNode->setColor( Qt::green ); - shadowNode->setShadowColor( Qt::magenta ); - shadowNode->setBorderWidth( 2 ); - shadowNode->setBorderColor( Qt::red ); - shadowNode->updateGeometry(); - return shadowNode; -} diff --git a/examples/iot-dashboard/QskShadowedRectangleSkinlet.h b/examples/iot-dashboard/QskShadowedRectangleSkinlet.h deleted file mode 100644 index f67efa00..00000000 --- a/examples/iot-dashboard/QskShadowedRectangleSkinlet.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef QSKSHADOWEDRECTANGLESKINLET_H -#define QSKSHADOWEDRECTANGLESKINLET_H - -#include "src/shadowedrectangle.h" - -#include - -class QskShadowedRectangle; - -class QskShadowedRectangleSkinlet : public QskSkinlet -{ - Q_GADGET - - public: - enum NodeRole - { - ShadowRole, - }; - - Q_INVOKABLE QskShadowedRectangleSkinlet( QskSkin* skin = nullptr ); - - QRectF subControlRect( const QskSkinnable*, const QRectF&, QskAspect::Subcontrol ) const override; - - protected: - virtual QSGNode* updateSubNode( const QskSkinnable*, quint8 nodeRole, QSGNode* node ) const override; - - private: - QSGNode* updateShadowNode( const QskShadowedRectangle*, QSGNode* ) const; - - // ### move this to the value class: - const std::unique_ptr m_border; - const std::unique_ptr m_shadow; - const std::unique_ptr m_corners; - qreal m_radius = 0.0; - QColor m_color = Qt::white; - PaintedRectangleItem* m_softwareItem = nullptr; -}; - -#endif // QSKSHADOWEDRECTANGLESKINLET_H diff --git a/examples/iot-dashboard/Skin.cpp b/examples/iot-dashboard/Skin.cpp index e74bd1cc..c193325d 100644 --- a/examples/iot-dashboard/Skin.cpp +++ b/examples/iot-dashboard/Skin.cpp @@ -6,8 +6,6 @@ #include "LightIntensity.h" #include "MainContent.h" #include "MenuBar.h" -#include "QskShadowedRectangle.h" -#include "QskShadowedRectangleSkinlet.h" #include "PieChartPainted.h" #include "TopBar.h" #include "UpAndDownButton.h" @@ -39,7 +37,6 @@ namespace Skin::Skin( const Palette& palette, QObject* parent ) : QskSkin( parent ) { - declareSkinlet< QskShadowedRectangle, QskShadowedRectangleSkinlet >(); initHints( palette ); } diff --git a/examples/iot-dashboard/iot-dashboard.pro b/examples/iot-dashboard/iot-dashboard.pro index d4f6ba0c..68b68cfc 100644 --- a/examples/iot-dashboard/iot-dashboard.pro +++ b/examples/iot-dashboard/iot-dashboard.pro @@ -12,8 +12,6 @@ SOURCES += \ PieChart.cpp \ PieChartPainted.cpp \ PieChartSkinlet.cpp \ - QskShadowedRectangle.cpp \ - QskShadowedRectangleSkinlet.cpp \ RoundedIcon.cpp \ Skin.cpp \ TopBar.cpp \ @@ -35,8 +33,6 @@ HEADERS += \ PieChart.h \ PieChartPainted.h \ PieChartSkinlet.h \ - QskShadowedRectangle.h \ - QskShadowedRectangleSkinlet.h \ RoundedIcon.h \ Skin.h \ TopBar.h \