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

Merge branch 'master' into features/arcrenderer

This commit is contained in:
Uwe Rathmann 2024-09-24 10:28:26 +02:00
parent dd333862f4 a25c19cbd1
commit 4e83c4f2ef
12 changed files with 86 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/QskFunctions.cpp
View File

@ -233,3 +233,17 @@ float qskConstrainedRadians( float radians )
return radians;
}
// do not export;
bool qskHasEnvironment( const char* env )
{
bool ok;
const int value = qEnvironmentVariableIntValue( env, &ok );
if ( ok )
return value != 0;
// All other strings are true, apart from "false"
auto result = qgetenv( env );
return !result.isEmpty() && result != "false";
}

10
src/common/QskRgbValue.h
View File

@ -209,6 +209,16 @@ namespace QskRgb
return toTransparent( rgb, qRound( opacity * 255 ) );
}
inline bool isVisible( QRgb rgb )
{
return qAlpha( rgb ) > 0;
}
inline bool isVisible( const QColor& color )
{
return color.isValid() && color.alpha() > 0;
}
QSK_EXPORT QRgb lighter( QRgb, int factor = 150 ) noexcept;
QSK_EXPORT QRgb darker( QRgb, int factor = 200 ) noexcept;
}

18
src/controls/QskSetup.cpp
View File

@ -5,31 +5,19 @@
#include "QskSetup.h"
extern bool qskHasEnvironment( const char* );
extern void qskUpdateItemFlags();
namespace
{
inline bool hasEnvironment( const char* env )
{
bool ok;
const int value = qEnvironmentVariableIntValue( env, &ok );
if ( ok )
return value != 0;
// All other strings are true, apart from "false"
auto result = qgetenv( env );
return !result.isEmpty() && result != "false";
}
inline const QskItem::UpdateFlags environmentUpdateFlags()
{
QskItem::UpdateFlags flags;
if ( !hasEnvironment( "QSK_PREFER_FBO_PAINTING" ) )
if ( !qskHasEnvironment( "QSK_PREFER_FBO_PAINTING" ) )
flags |= QskItem::PreferRasterForTextures;
if ( hasEnvironment( "QSK_FORCE_BACKGROUND" ) )
if ( qskHasEnvironment( "QSK_FORCE_BACKGROUND" ) )
flags |= QskItem::DebugForceBackground;
return flags;

6
src/controls/QskSimpleListBox.cpp
View File

@ -173,10 +173,8 @@ void QskSimpleListBox::removeAt( int index )
if ( w >= m_data->maxTextWidth )
m_data->maxTextWidth = qskMaxWidth( effectiveFont( Text ), entries );
}
else
{
entries.removeAt( index );
}
entries.removeAt( index );
propagateEntries();

14
src/nodes/QskArcNode.cpp
View File

@ -12,6 +12,7 @@
#include "QskGradient.h"
#include "QskSGNode.h"
#include "QskShadowMetrics.h"
#include "QskRgbValue.h"
#include <qpainterpath.h>
@ -91,12 +92,10 @@ void QskArcNode::setArcData( const QRectF& rect, const QskArcMetrics& arcMetrics
const auto metricsArc = arcMetrics.toAbsolute( rect.size() );
const auto hasFilling = gradient.isVisible();
const auto hasBorder = ( borderWidth > 0.0 )
&& borderColor.isValid() && ( borderColor.alpha() > 0 );
const auto hasBorder = ( borderWidth > 0.0 ) && QskRgb::isVisible( borderColor );
const auto hasShadow = hasFilling && QskRgb::isVisible( shadowColor );
const auto hasShadow = shadowColor.isValid() && ( shadowColor.alpha() > 0 );
if ( hasShadow && hasFilling )
if ( hasShadow )
{
/*
The shader of the shadow node is for circular arcs and we have some
@ -121,7 +120,10 @@ void QskArcNode::setArcData( const QRectF& rect, const QskArcMetrics& arcMetrics
if ( hasBorder && hasFilling )
{
if ( !QskArcRenderer::isGradientSupported( rect, metricsArc, gradient ) )
const bool doCombine = arcNode->hasHint( QskFillNode::PreferColoredGeometry )
&& QskArcRenderer::isGradientSupported( rect, metricsArc, gradient );
if ( !doCombine )
fillNode = qskNode< QskArcRenderNode >( this, FillRole );
}

5
src/nodes/QskArcRenderNode.cpp
View File

@ -9,11 +9,12 @@
#include "QskArcMetrics.h"
#include "QskGradient.h"
#include "QskSGNode.h"
#include "QskRgbValue.h"
#include "QskFillNodePrivate.h"
static inline bool qskHasBorder( qreal width, const QColor& color )
{
return ( width > 0.0 ) && color.isValid() && ( color.alpha() > 0 );
return ( width > 0.0 ) && QskRgb::isVisible( color );
}
class QskArcRenderNodePrivate final : public QskFillNodePrivate
@ -42,7 +43,7 @@ class QskArcRenderNodePrivate final : public QskFillNodePrivate
{
QskHashValue hash = 13000;
if ( borderColor.isValid() && ( borderColor.alpha() > 0 ) )
if ( QskRgb::isVisible( borderColor ) )
hash = qHashBits( &borderColor, sizeof( borderColor ), hash );
if ( gradient.isVisible() )

2
src/nodes/QskArcRenderer.cpp
View File

@ -489,7 +489,7 @@ void QskArcRenderer::setColoredBorderLines( const QRectF& rect,
geometry.setDrawingMode( QSGGeometry::DrawTriangleStrip );
geometry.markVertexDataDirty();
if ( borderWidth <= 0.0 || !( borderColor.isValid() && borderColor.alpha() > 0 ) )
if ( borderWidth <= 0.0 || !QskRgb::isVisible( borderColor ) )
{
qskAllocateColoredLines( geometry, 0 );
return;

34
src/nodes/QskBoxNode.cpp
View File

@ -13,6 +13,7 @@
#include "QskShadowMetrics.h"
#include "QskBoxBorderMetrics.h"
#include "QskBoxBorderColors.h"
#include "QskRgbValue.h"
namespace
{
@ -69,32 +70,41 @@ void QskBoxNode::updateNode( const QRectF& rect,
if ( !rect.isEmpty() )
{
if ( !shadowMetrics.isNull()
&& shadowColor.isValid() && shadowColor.alpha() != 0 )
const auto hasFilling = gradient.isVisible();
const auto hasBorder = !borderMetrics.isNull() && borderColors.isVisible();
const auto hasShadow = hasFilling && !shadowMetrics.isNull()
&& QskRgb::isVisible( shadowColor );
if ( hasShadow )
{
shadowNode = qskNode< QskBoxShadowNode >( this, ShadowRole );
shadowNode->setShadowData( shadowMetrics.shadowRect( rect ),
shape, shadowMetrics.blurRadius(), shadowColor );
}
if ( QskBoxRectangleNode::isCombinedGeometrySupported( gradient ) )
if ( hasBorder || hasFilling )
{
rectNode = qskNode< QskBoxRectangleNode >( this, BoxRole );
rectNode->updateBox( rect, shape, borderMetrics, borderColors, gradient );
}
else
{
if ( !borderMetrics.isNull() && borderColors.isVisible() )
if ( hasBorder && hasFilling )
{
rectNode = qskNode< QskBoxRectangleNode >( this, BoxRole );
rectNode->updateBorder( rect, shape, borderMetrics, borderColors );
const bool doCombine = rectNode->hasHint( QskFillNode::PreferColoredGeometry )
&& QskBoxRectangleNode::isCombinedGeometrySupported( gradient );
if ( !doCombine )
fillNode = qskNode< QskBoxRectangleNode >( this, FillRole );
}
if ( gradient.isVisible() )
if ( fillNode )
{
fillNode = qskNode< QskBoxRectangleNode >( this, FillRole );
rectNode->updateBorder( rect, shape, borderMetrics, borderColors );
fillNode->updateFilling( rect, shape, borderMetrics, gradient );
}
else
{
rectNode->updateBox( rect, shape, borderMetrics, borderColors, gradient );
}
}
}

10
src/nodes/QskBoxRectangleNode.cpp
View File

@ -128,15 +128,7 @@ void QskBoxRectangleNode::updateFilling( const QRectF& rect,
}
else
{
if ( fillGradient.isMonochrome() )
{
if ( dirtyMaterial )
setColoring( fillGradient.rgbStart() );
}
else
{
setColoring( rect, fillGradient );
}
setColoring( rect, fillGradient );
if ( dirtyGeometry )
{

14
src/nodes/QskFillNode.cpp
View File

@ -26,6 +26,17 @@ static inline QskFillNode::Coloring qskColoring( QskGradient::Type type )
return static_cast< QskFillNode::Coloring >( coloring );
}
static inline QskFillNode::Hints qskDefaultFillNodeHints()
{
extern bool qskHasEnvironment( const char* );
QskFillNode::Hints hints;
if ( !qskHasEnvironment( "QSK_PREFER_SHADER_COLORS" ) )
hints |= QskFillNode::PreferColoredGeometry;
return hints;
}
QskFillNode::QskFillNode()
: QskFillNode( *new QskFillNodePrivate )
{
@ -34,6 +45,9 @@ QskFillNode::QskFillNode()
QskFillNode::QskFillNode( QskFillNodePrivate& dd )
: QSGGeometryNode( dd )
{
static const auto hints = qskDefaultFillNodeHints();
dd.hints = hints;
setGeometry( &dd.geometry );
setMaterial( qskMaterialColorVertex );

8
src/nodes/QskLinesNode.cpp
View File

@ -8,6 +8,7 @@
#include "QskStippleMetrics.h"
#include "QskStippledLineRenderer.h"
#include "QskSGNode.h"
#include "QskRgbValue.h"
#include <qtransform.h>
#include <qline.h>
@ -163,8 +164,7 @@ void QskLinesNode::updateLines( const QColor& color,
qreal lineWidth, const QskStippleMetrics& stippleMetrics,
const QTransform& transform, int count, const QLineF* lines )
{
if ( !stippleMetrics.isValid() || !color.isValid()
|| color.alpha() == 0 || count == 0 )
if ( !stippleMetrics.isValid() || !QskRgb::isVisible( color ) || count == 0 )
{
QskSGNode::resetGeometry( this );
return;
@ -195,7 +195,7 @@ void QskLinesNode::updateGrid( const QColor& color,
const QTransform& transform, const QRectF& rect,
const QVector< qreal >& xValues, const QVector< qreal >& yValues )
{
if ( !stippleMetrics.isValid() || !color.isValid() || color.alpha() == 0 )
if ( !stippleMetrics.isValid() || !QskRgb::isVisible( color ) )
{
QskSGNode::resetGeometry( this );
return;
@ -409,7 +409,7 @@ QSGGeometry::Point2D* QskLinesNode::setSolidLines(
void QskLinesNode::updatePolygon( const QColor& color, qreal lineWidth,
const QTransform& transform, const QPolygonF& polygon )
{
if ( polygon.isEmpty() || !color.isValid() || ( color.alpha() == 0 ) )
if ( polygon.isEmpty() || !QskRgb::isVisible( color ) )
{
QskSGNode::resetGeometry( this );
return;

3
src/nodes/QskStrokeNode.cpp
View File

@ -6,6 +6,7 @@
#include "QskStrokeNode.h"
#include "QskVertex.h"
#include "QskGradient.h"
#include "QskRgbValue.h"
#include <qpainterpath.h>
@ -24,7 +25,7 @@ static inline bool qskIsPenVisible( const QPen& pen )
}
else
{
if ( !pen.color().isValid() || ( pen.color().alpha() == 0 ) )
if ( !QskRgb::isVisible( pen.color() ) )
return false;
}