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

beautified

This commit is contained in:
Uwe Rathmann 2021-12-23 19:05:59 +01:00
parent 8010d70e4a
commit ca2cdf7663
19 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/QskGradient.cpp
View File

@ -145,7 +145,7 @@ static inline QskGradientStops qskExtractedStops(
} }
const auto color = const auto color =
QskGradientStop::interpolated( stops[i-1], stops[i], from ); QskGradientStop::interpolated( stops[i - 1], stops[i], from );
extracted += QskGradientStop( 0.0, color ); extracted += QskGradientStop( 0.0, color );
} }
@ -161,7 +161,7 @@ static inline QskGradientStops qskExtractedStops(
extracted += QskGradientStop( pos, s.color() ); extracted += QskGradientStop( pos, s.color() );
} }
const auto color = QskGradientStop::interpolated( stops[i-1], stops[i], to ); const auto color = QskGradientStop::interpolated( stops[i - 1], stops[i], to );
extracted += QskGradientStop( 1.0, color ); extracted += QskGradientStop( 1.0, color );
return extracted; return extracted;

6
src/common/QskRgbPalette.cpp
View File

@ -10,10 +10,10 @@
#define RGB( color, weight ) color ## weight #define RGB( color, weight ) color ## weight
#define RGBTABLE( c ) \ #define RGBTABLE( c ) \
{ \ { \
RGB( c, 50 ), RGB( c, 100 ), RGB( c, 200 ), RGB( c, 300 ), RGB( c, 400 ), \ RGB( c, 50 ), RGB( c, 100 ), RGB( c, 200 ), RGB( c, 300 ), RGB( c, 400 ), \
RGB( c, 500 ), RGB( c, 600 ), RGB( c, 700 ), RGB( c, 800 ), RGB( c, 900 ) \ RGB( c, 500 ), RGB( c, 600 ), RGB( c, 700 ), RGB( c, 800 ), RGB( c, 900 ) \
} }
namespace namespace
{ {
@ -77,7 +77,7 @@ static QskGradientStops qskColorStops(
for ( int i = 1; i < count; i++ ) for ( int i = 1; i < count; i++ )
{ {
const qreal pos = i * step; const qreal pos = i * step;
stops += QskGradientStop( pos, rgb[i-1] ); stops += QskGradientStop( pos, rgb[i - 1] );
stops += QskGradientStop( pos, rgb[i] ); stops += QskGradientStop( pos, rgb[i] );
} }
} }

4
src/controls/QskMenuSkinlet.h
View File

@ -20,8 +20,8 @@ class QSK_EXPORT QskMenuSkinlet : public QskPopupSkinlet
Q_INVOKABLE QskMenuSkinlet( QskSkin* = nullptr ); Q_INVOKABLE QskMenuSkinlet( QskSkin* = nullptr );
~QskMenuSkinlet() = default; ~QskMenuSkinlet() = default;
QRectF subControlRect( const QskSkinnable*, const QRectF&, QRectF subControlRect( const QskSkinnable*,
QskAspect::Subcontrol ) const override; const QRectF&, QskAspect::Subcontrol ) const override;
QSizeF sizeHint( const QskSkinnable*, QSizeF sizeHint( const QskSkinnable*,
Qt::SizeHint, const QSizeF& ) const override; Qt::SizeHint, const QSizeF& ) const override;

2
src/controls/QskSkinlet.cpp
View File

@ -26,7 +26,7 @@
#include <qquickwindow.h> #include <qquickwindow.h>
#include <qsgsimplerectnode.h> #include <qsgsimplerectnode.h>
static inline QRectF qskSceneAlignedRect( const QQuickItem* item , const QRectF& rect ) static inline QRectF qskSceneAlignedRect( const QQuickItem* item, const QRectF& rect )
{ {
/* /*
Aligning rect according to scene coordinates, so that Aligning rect according to scene coordinates, so that

2
src/controls/QskStatusIndicator.h
View File

@ -44,7 +44,7 @@ class QSK_EXPORT QskStatusIndicator : public QskControl
int status() const; int status() const;
bool hasStatus( int status ) const; bool hasStatus( int status ) const;
QList<int> statusList() const; QList< int > statusList() const;
public Q_SLOTS: public Q_SLOTS:
void setStatus( int status ); void setStatus( int status );

4
src/nodes/QskArcNode.cpp
View File

@ -15,7 +15,7 @@ QskArcNode::~QskArcNode()
} }
void QskArcNode::setArcData( const QRectF& rect, const QskArcMetrics& metrics, void QskArcNode::setArcData( const QRectF& rect, const QskArcMetrics& metrics,
const QskGradient &gradient, QQuickWindow* window ) const QskGradient& gradient, QQuickWindow* window )
{ {
m_metrics = metrics; m_metrics = metrics;
m_gradient = gradient; m_gradient = gradient;
@ -23,7 +23,7 @@ void QskArcNode::setArcData( const QRectF& rect, const QskArcMetrics& metrics,
update( window, QskTextureRenderer::AutoDetect, rect.toRect() ); update( window, QskTextureRenderer::AutoDetect, rect.toRect() );
} }
void QskArcNode::paint( QPainter* painter, const QSizeF &size ) void QskArcNode::paint( QPainter* painter, const QSizeF& size )
{ {
const qreal w = m_metrics.width(); const qreal w = m_metrics.width();
const QRectF rect( 0.5 * w, 0.5 * w, size.width() - w, size.height() - w ); const QRectF rect( 0.5 * w, 0.5 * w, size.width() - w, size.height() - w );