From b36521b0ed266f0059531434175162fb68cd309d Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Fri, 9 Dec 2022 11:50:31 +0100 Subject: [PATCH] code moved to cpp file --- src/nodes/QskBoxRenderer.cpp | 2 -- src/nodes/QskBoxRenderer.h | 35 ++------------------------------ src/nodes/QskBoxRendererRect.cpp | 34 ------------------------------- src/src.pro | 1 + 4 files changed, 3 insertions(+), 69 deletions(-) diff --git a/src/nodes/QskBoxRenderer.cpp b/src/nodes/QskBoxRenderer.cpp index 86204a06..d2116f57 100644 --- a/src/nodes/QskBoxRenderer.cpp +++ b/src/nodes/QskBoxRenderer.cpp @@ -4,8 +4,6 @@ *****************************************************************************/ #include "QskBoxRenderer.h" -#include "QskRectRenderer.h" -#include "QskRoundedRectRenderer.h" #include "QskBoxShapeMetrics.h" #include "QskGradient.h" diff --git a/src/nodes/QskBoxRenderer.h b/src/nodes/QskBoxRenderer.h index 29e71368..2e56927b 100644 --- a/src/nodes/QskBoxRenderer.h +++ b/src/nodes/QskBoxRenderer.h @@ -6,15 +6,15 @@ #ifndef QSK_BOX_RENDERER_H #define QSK_BOX_RENDERER_H -#include "QskBoxShapeMetrics.h" #include "QskVertex.h" -#include class QskBoxBorderMetrics; class QskBoxBorderColors; +class QskBoxShapeMetrics; class QskGradient; class QSGGeometry; +class QRectF; class QSK_EXPORT QskBoxRenderer { @@ -85,35 +85,4 @@ class QSK_EXPORT QskBoxRenderer const QskGradient&, QskVertex::ColoredLine* ); }; -inline void QskBoxRenderer::renderBorder( - const QRectF& rect, const QskBoxShapeMetrics& shape, - const QskBoxBorderMetrics& border, QSGGeometry& geometry ) -{ - if ( shape.isRectangle() ) - renderRectBorder( rect, border, geometry ); - else - renderRectellipseBorder( rect, shape, border, geometry ); -} - -inline void QskBoxRenderer::renderFill( - const QRectF& rect, const QskBoxShapeMetrics& shape, - const QskBoxBorderMetrics& border, QSGGeometry& geometry ) -{ - if ( shape.isRectangle() ) - renderRectFill( rect, border, geometry ); - else - renderRectellipseFill( rect, shape, border, geometry ); -} - -inline void QskBoxRenderer::renderBox( const QRectF& rect, - const QskBoxShapeMetrics& shape, const QskBoxBorderMetrics& border, - const QskBoxBorderColors& borderColors, const QskGradient& gradient, - QSGGeometry& geometry ) -{ - if ( shape.isRectangle() ) - renderRect( rect, border, borderColors, gradient, geometry ); - else - renderRectellipse( rect, shape, border, borderColors, gradient, geometry ); -} - #endif diff --git a/src/nodes/QskBoxRendererRect.cpp b/src/nodes/QskBoxRendererRect.cpp index acc12664..4fe9ee8c 100644 --- a/src/nodes/QskBoxRendererRect.cpp +++ b/src/nodes/QskBoxRendererRect.cpp @@ -662,37 +662,3 @@ void QskBoxRenderer::renderRectFill( const QskVertex::Quad& rect, { qskCreateFillOrdered( rect, gradient, line ); } - -bool QskBoxRenderer::isGradientSupported( - const QskBoxShapeMetrics&, const QskGradient& gradient ) -{ - if ( !gradient.isVisible() || gradient.isMonochrome() ) - return true; - - switch( gradient.type() ) - { - case QskGradient::Linear: - { - auto dir = gradient.linearDirection(); - - if ( dir.isTilted() ) - { - // only diagonal from topLeft to bottomRight - return ( dir.x1() == 0.0 ) && ( dir.y1() == 0.0 ) - && ( dir.x2() == 1.0 ) && ( dir.y2() == 1.0 ); - } - - return true; - } - case QskGradient::Radial: - case QskGradient::Conic: - { - return false; - } - default: - { - return true; - } - } -} - diff --git a/src/src.pro b/src/src.pro index cffc61c5..8394237c 100644 --- a/src/src.pro +++ b/src/src.pro @@ -132,6 +132,7 @@ SOURCES += \ nodes/QskBoxClipNode.cpp \ nodes/QskBoxFillNode.cpp \ nodes/QskBoxRectangleNode.cpp \ + nodes/QskBoxRenderer.cpp \ nodes/QskBoxRendererRect.cpp \ nodes/QskBoxRendererEllipse.cpp \ nodes/QskBoxRendererDEllipse.cpp \