This commit is contained in:
Uwe Rathmann 2024-09-03 08:14:41 +02:00
parent b97507bf84
commit 8bc7146de0
5 changed files with 2 additions and 35 deletions

View File

@ -14,17 +14,6 @@
#include "TopBar.h" #include "TopBar.h"
#include "UsageBox.h" #include "UsageBox.h"
#include <QskBoxBorderColors.h>
#include <QskBoxBorderMetrics.h>
#include <QskBoxShapeMetrics.h>
#include <QskGridBox.h>
#include <QskSetup.h>
#include <QskSkin.h>
#include <QskTextLabel.h>
#include <QskQuick.h>
#include <QTimer>
QSK_SUBCONTROL( DashboardPage, Panel ) QSK_SUBCONTROL( DashboardPage, Panel )
namespace namespace

View File

@ -51,17 +51,6 @@ bool LightDisplay::isPressed() const
return hasSkinState( Pressed ); 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 ) void LightDisplay::mousePressEvent( QMouseEvent* event )
{ {
QRectF handleRect = subControlRect( LightDisplay::Knob ); QRectF handleRect = subControlRect( LightDisplay::Knob );

View File

@ -6,7 +6,6 @@
#pragma once #pragma once
#include <QskBoundedValueInput.h> #include <QskBoundedValueInput.h>
#include <QskBoxShapeMetrics.h>
#include <QskShadowMetrics.h> #include <QskShadowMetrics.h>
class LightDisplay : public QskBoundedValueInput class LightDisplay : public QskBoundedValueInput
@ -22,9 +21,6 @@ class LightDisplay : public QskBoundedValueInput
bool isPressed() const; bool isPressed() const;
void setGradient( const QskGradient& );
const QskGradient& gradient() const;
protected: protected:
void mousePressEvent( QMouseEvent* e ) override; void mousePressEvent( QMouseEvent* e ) override;
void mouseMoveEvent( QMouseEvent* e ) override; void mouseMoveEvent( QMouseEvent* e ) override;
@ -33,9 +29,4 @@ class LightDisplay : public QskBoundedValueInput
private: private:
qreal angleFromPoint( const QRectF&, const QPointF& ) const; qreal angleFromPoint( const QRectF&, const QPointF& ) const;
bool arcContainsPoint( const QRectF&, const QPointF& ) const; bool arcContainsPoint( const QRectF&, const QPointF& ) const;
QskShadowMetrics m_shadow;
QColor m_shadowColor = Qt::black;
QskGradient m_gradient;
}; };

View File

@ -322,7 +322,7 @@ Skin::Palette Skin::palette( QskSkin::ColorScheme colorScheme ) const
Qt::white, Qt::white,
0xff4a4a4a, 0xff4a4a4a,
0xff555555, 0xff555555,
{ { { 0.0, 0xff991100 }, { 0.2, 0xff9a7a57 }, { 0.5, 0xff3726af }, { 1.0, Qt::black } } }, { { { 0.0, 0xff991100 }, { 0.4, 0xff9a7a57 }, { 1.0, 0xff3726af } } },
0x10ffffff, 0x10ffffff,
0xff222222 0xff222222
}; };
@ -339,8 +339,7 @@ Skin::Palette Skin::palette( QskSkin::ColorScheme colorScheme ) const
Qt::black, Qt::black,
0xffe5e5e5, 0xffe5e5e5,
0xffc4c4c4, 0xffc4c4c4,
{ { { 0.0, 0xffff3122 }, { 0.2, 0xfffeeeb7 }, { 0.3, 0xffa7b0ff }, { 0.5, 0xff6776ff }, { { { 0.0, 0xffff3122 }, { 0.4, 0xfffeeeb7 }, { 0.6, 0xffa7b0ff }, { 1.0, 0xff6776ff } } },
{ 1.0, Qt::black } } },
0x10000000, 0x10000000,
0xffdddddd 0xffdddddd
}; };

View File

@ -34,5 +34,4 @@ class Skin : public QskSkin
void initHints() override; void initHints() override;
Palette palette( ColorScheme ) const; Palette palette( ColorScheme ) const;
void initHints( const Palette& );
}; };