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

version ifdefing simplified

This commit is contained in:
Uwe Rathmann 2020-10-20 17:47:19 +02:00
parent a5cf44a869
commit bb0cb27e69
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/nodes/QskPlainTextRenderer.cpp
View File

@ -13,15 +13,8 @@
QSK_QT_PRIVATE_BEGIN QSK_QT_PRIVATE_BEGIN
#include <private/qsgadaptationlayer_p.h> #include <private/qsgadaptationlayer_p.h>
#if QT_VERSION < QT_VERSION_CHECK( 5, 8, 0 )
#include <private/qsgcontext_p.h> #include <private/qsgcontext_p.h>
typedef QSGRenderContext RenderContext; #include <private/qquickitem_p.h>
#else
#include <private/qsgdefaultrendercontext_p.h>
typedef QSGDefaultRenderContext RenderContext;
#endif
QSK_QT_PRIVATE_END QSK_QT_PRIVATE_END
#define GlyphFlag static_cast< QSGNode::Flag >( 0x800 ) #define GlyphFlag static_cast< QSGNode::Flag >( 0x800 )
@ -107,7 +100,7 @@ static void qskRenderText(
QQuickItem* item, QSGNode* parentNode, const QTextLayout& layout, qreal baseLine, QQuickItem* item, QSGNode* parentNode, const QTextLayout& layout, qreal baseLine,
const QColor& color, QQuickText::TextStyle style, const QColor& styleColor ) const QColor& color, QQuickText::TextStyle style, const QColor& styleColor )
{ {
auto renderContext = RenderContext::from( QOpenGLContext::currentContext() ); auto renderContext = QQuickItemPrivate::get(item)->sceneGraphRenderContext();
auto sgContext = renderContext->sceneGraphContext(); auto sgContext = renderContext->sceneGraphContext();
// Clear out foreign nodes (e.g. from QskRichTextRenderer) // Clear out foreign nodes (e.g. from QskRichTextRenderer)
@ -137,7 +130,14 @@ static void qskRenderText(
{ {
const bool preferNativeGlyphNode = false; // QskTextOptions? const bool preferNativeGlyphNode = false; // QskTextOptions?
glyphNode = sgContext->createGlyphNode( renderContext, preferNativeGlyphNode ); #if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 )
constexpr int renderQuality = -1; // QQuickText::DefaultRenderTypeQuality
glyphNode = sgContext->createGlyphNode(
renderContext, preferNativeGlyphNode, renderQuality );
#else
glyphNode = sgContext->createGlyphNode(
renderContext, preferNativeGlyphNode );
#endif
glyphNode->setOwnerElement( item ); glyphNode->setOwnerElement( item );
glyphNode->setFlags( QSGNode::OwnedByParent | GlyphFlag ); glyphNode->setFlags( QSGNode::OwnedByParent | GlyphFlag );
} }