peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor adjustments

Browse Source
This commit is contained in:
Uwe Rathmann 2022-10-26 17:02:06 +02:00
parent 4aeea2d6f8
commit 9336e60c33
5 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/iotdashboard/CircularProgressBar.cpp
View File

@ -6,7 +6,6 @@
#include "CircularProgressBar.h" #include "CircularProgressBar.h"
#include <QskAnimator.h> #include <QskAnimator.h>
#include <QskArcMetrics.h>
#include <QskFunctions.h> #include <QskFunctions.h>
QSK_SUBCONTROL( CircularProgressBar, Groove ) QSK_SUBCONTROL( CircularProgressBar, Groove )

4
examples/iotdashboard/LightDisplay.cpp
View File

@ -117,7 +117,7 @@ void LightDisplay::mouseMoveEvent( QMouseEvent* event )
return; return;
} }
const QskArcMetrics metrics = arcMetricsHint( ColdAndWarmArc ); const auto metrics = arcMetricsHint( ColdAndWarmArc );
qreal angle = angleFromPoint( rect, mousePos ); qreal angle = angleFromPoint( rect, mousePos );
const int tolerance = 20; 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 // putting this in an own function just because it might be useful
// at other places in the future // at other places in the future
const QskArcMetrics metrics = arcMetricsHint( ColdAndWarmArc ); const auto metrics = arcMetricsHint( ColdAndWarmArc );
const int tolerance = 20; const int tolerance = 20;
// 1. check angle // 1. check angle

16
examples/iotdashboard/LightDisplaySkinlet.cpp
View File

@ -37,8 +37,8 @@ QRectF LightDisplaySkinlet::subControlRect( const QskSkinnable* skinnable,
if( subControl == LightDisplay::Groove || subControl == LightDisplay::Panel ) if( subControl == LightDisplay::Groove || subControl == LightDisplay::Panel )
{ {
QSizeF textSize = textLabelsSize( display ); const auto textSize = textLabelsSize( display );
QskArcMetrics arcMetrics = display->arcMetricsHint( LightDisplay::ColdAndWarmArc ); const auto arcMetrics = display->arcMetricsHint( LightDisplay::ColdAndWarmArc );
const qreal ticksWidth = display->arcMetricsHint( LightDisplay::Tickmarks ).width() + ticksSpacing; const qreal ticksWidth = display->arcMetricsHint( LightDisplay::Tickmarks ).width() + ticksSpacing;
const qreal x = textSize.width() + arcMetrics.width() + ticksWidth; const qreal x = textSize.width() + arcMetrics.width() + ticksWidth;
@ -81,7 +81,7 @@ QRectF LightDisplaySkinlet::subControlRect( const QskSkinnable* skinnable,
else if( subControl == LightDisplay::LeftLabel ) else if( subControl == LightDisplay::LeftLabel )
{ {
const QRectF ticksRect = subControlRect( skinnable, contentsRect, LightDisplay::Tickmarks ); const QRectF ticksRect = subControlRect( skinnable, contentsRect, LightDisplay::Tickmarks );
QSizeF size = textLabelsSize( display ); const auto size = textLabelsSize( display );
rect.setWidth( size.width() ); rect.setWidth( size.width() );
@ -92,8 +92,8 @@ QRectF LightDisplaySkinlet::subControlRect( const QskSkinnable* skinnable,
} }
else if( subControl == LightDisplay::RightLabel ) else if( subControl == LightDisplay::RightLabel )
{ {
QRectF ticksRect = subControlRect( skinnable, contentsRect, LightDisplay::Tickmarks ); const auto ticksRect = subControlRect( skinnable, contentsRect, LightDisplay::Tickmarks );
QSizeF size = textLabelsSize( display ); const auto size = textLabelsSize( display );
rect.setX( ticksRect.x() + ticksRect.width() ); rect.setX( ticksRect.x() + ticksRect.width() );
@ -104,9 +104,9 @@ QRectF LightDisplaySkinlet::subControlRect( const QskSkinnable* skinnable,
} }
else if( subControl == LightDisplay::Knob ) else if( subControl == LightDisplay::Knob )
{ {
QRectF arcRect = subControlRect( skinnable, contentsRect, LightDisplay::ColdAndWarmArc ); const auto arcRect = subControlRect( skinnable, contentsRect, LightDisplay::ColdAndWarmArc );
QskArcMetrics arcMetrics = display->arcMetricsHint( LightDisplay::ColdAndWarmArc ); const auto arcMetrics = display->arcMetricsHint( LightDisplay::ColdAndWarmArc );
QSizeF knobSize = display->strutSizeHint( LightDisplay::Knob ); const auto knobSize = display->strutSizeHint( LightDisplay::Knob );
const qreal radius = ( arcRect.width() - arcMetrics.width() ) / 2; const qreal radius = ( arcRect.width() - arcMetrics.width() ) / 2;
const qreal angle = display->valueAsRatio() * 180; const qreal angle = display->valueAsRatio() * 180;

2
examples/iotdashboard/Skin.cpp
View File

@ -218,7 +218,7 @@ void Skin::initHints( const Palette& palette )
ed.setGradient( MenuBar::Panel, palette.menuBar ); ed.setGradient( MenuBar::Panel, palette.menuBar );
ed.setGradient( DashboardPage::Panel, palette.mainContent ); ed.setGradient( DashboardPage::Panel, palette.mainContent );
ed.setColor( Box::Panel, palette.box.startColor() ); ed.setColor( Box::Panel, palette.box );
QskShadowMetrics shadowMetrics( 0, 10 ); QskShadowMetrics shadowMetrics( 0, 10 );
ed.setShadowMetrics( Box::Panel, shadowMetrics ); ed.setShadowMetrics( Box::Panel, shadowMetrics );
ed.setShadowColor( Box::Panel, palette.shadow ); ed.setShadowColor( Box::Panel, palette.shadow );

8
examples/iotdashboard/Skin.h
View File

@ -13,10 +13,10 @@ class Skin : public QskSkin
public: public:
struct Palette struct Palette
{ {
QskGradient menuBar; QColor menuBar;
QskGradient mainContent; QColor mainContent;
QskGradient box; QColor box;
QskGradient roundButton; QColor roundButton;
QColor weekdayBox; QColor weekdayBox;
QColor text; QColor text;
QColor shadow; QColor shadow;