From 2aa7877152d7999981c4657da3b737a24e0d3569 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Fri, 20 Oct 2017 15:29:50 +0200 Subject: [PATCH] cleaning up QskTextNode --- src/controls/QskSkinRenderer.cpp | 4 ++-- src/nodes/QskPlainTextRenderer.cpp | 2 +- src/nodes/QskPlainTextRenderer.h | 3 +-- src/nodes/QskTextNode.cpp | 1 + src/nodes/QskTextNode.h | 5 ----- src/nodes/QskTextRenderer.cpp | 2 +- src/nodes/QskTextRenderer.h | 3 +-- 7 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/controls/QskSkinRenderer.cpp b/src/controls/QskSkinRenderer.cpp index 4b5e55fc..af337e98 100644 --- a/src/controls/QskSkinRenderer.cpp +++ b/src/controls/QskSkinRenderer.cpp @@ -27,7 +27,7 @@ QSizeF QskSkinRenderer::textSize( const QskSkinnable* skinnable, renderer.setFont( font ); renderer.setOptions( options ); - return renderer.implicitSizeHint( text ); + return renderer.textSize( text ); } else { @@ -35,7 +35,7 @@ QSizeF QskSkinRenderer::textSize( const QskSkinnable* skinnable, renderer.setFont( font ); renderer.setOptions( options ); - return renderer.implicitSizeHint( text ); + return renderer.textSize( text ); } } diff --git a/src/nodes/QskPlainTextRenderer.cpp b/src/nodes/QskPlainTextRenderer.cpp index 053e27ab..47e9d2d6 100644 --- a/src/nodes/QskPlainTextRenderer.cpp +++ b/src/nodes/QskPlainTextRenderer.cpp @@ -51,7 +51,7 @@ void QskPlainTextRenderer::setAlignment( Qt::Alignment alignment ) m_alignment = alignment; } -QSizeF QskPlainTextRenderer::implicitSizeHint( const QString& text ) const +QSizeF QskPlainTextRenderer::textSize( const QString& text ) const { // result differs from QskTextRenderer::implicitSizeHint ??? return textRect( QSizeF( 10e6, 10e6 ), text ).size(); diff --git a/src/nodes/QskPlainTextRenderer.h b/src/nodes/QskPlainTextRenderer.h index 229fd9de..5f7a2c28 100644 --- a/src/nodes/QskPlainTextRenderer.h +++ b/src/nodes/QskPlainTextRenderer.h @@ -38,8 +38,7 @@ public: static void updateNodeColor( QSGNode* parentNode, const QColor& textColor, Qsk::TextStyle, const QColor& styleColor ); - QSizeF implicitSizeHint( const QString& ) const; - + QSizeF textSize( const QString& ) const; QRectF textRect( const QSizeF&, const QString& ) const; private: diff --git a/src/nodes/QskTextNode.cpp b/src/nodes/QskTextNode.cpp index 8a486d83..c7cb8e84 100644 --- a/src/nodes/QskTextNode.cpp +++ b/src/nodes/QskTextNode.cpp @@ -7,6 +7,7 @@ #include "QskTextOptions.h" #include +#include #include QskTextNode::QskTextNode(): diff --git a/src/nodes/QskTextNode.h b/src/nodes/QskTextNode.h index 2ea41415..ef30acba 100644 --- a/src/nodes/QskTextNode.h +++ b/src/nodes/QskTextNode.h @@ -10,7 +10,6 @@ #include "QskNamespace.h" #include -#include #include class QskTextOptions; @@ -27,10 +26,6 @@ public: const QColor& textColor, const QColor& styleColor, const QColor& linkColor ); private: uint m_hash; - - QColor m_textRgb; - QColor m_styleRgb; - QColor m_linkRgb; }; #endif diff --git a/src/nodes/QskTextRenderer.cpp b/src/nodes/QskTextRenderer.cpp index a85bb522..f09b4da5 100644 --- a/src/nodes/QskTextRenderer.cpp +++ b/src/nodes/QskTextRenderer.cpp @@ -96,7 +96,7 @@ void QskTextRenderer::setAlignment( Qt::Alignment alignment ) m_alignment = alignment; } -QSizeF QskTextRenderer::implicitSizeHint( const QString& text ) const +QSizeF QskTextRenderer::textSize( const QString& text ) const { if ( qskLayoutHelper == NULL ) qskLayoutHelper = new QskTextHelperItem(); diff --git a/src/nodes/QskTextRenderer.h b/src/nodes/QskTextRenderer.h index e8708050..b41b0518 100644 --- a/src/nodes/QskTextRenderer.h +++ b/src/nodes/QskTextRenderer.h @@ -39,8 +39,7 @@ public: QSGTransformNode*, const QColor& textColor, Qsk::TextStyle, const QColor& styleColor, const QColor& linkColor ); - QSizeF implicitSizeHint( const QString& ) const; - + QSizeF textSize( const QString& ) const; QRectF textRect( const QSizeF&, const QString& ) const; private: