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

cleaning up QskTextNode

Browse Source
This commit is contained in:
Uwe Rathmann 2017-10-20 15:29:50 +02:00
parent 609bd9aac7
commit 2aa7877152
7 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/controls/QskSkinRenderer.cpp
View File

@ -27,7 +27,7 @@ QSizeF QskSkinRenderer::textSize( const QskSkinnable* skinnable,
renderer.setFont( font ); renderer.setFont( font );
renderer.setOptions( options ); renderer.setOptions( options );
return renderer.implicitSizeHint( text ); return renderer.textSize( text );
} }
else else
{ {
@ -35,7 +35,7 @@ QSizeF QskSkinRenderer::textSize( const QskSkinnable* skinnable,
renderer.setFont( font ); renderer.setFont( font );
renderer.setOptions( options ); renderer.setOptions( options );
return renderer.implicitSizeHint( text ); return renderer.textSize( text );
} }
} }

2
src/nodes/QskPlainTextRenderer.cpp
View File

@ -51,7 +51,7 @@ void QskPlainTextRenderer::setAlignment( Qt::Alignment alignment )
m_alignment = alignment; m_alignment = alignment;
} }
QSizeF QskPlainTextRenderer::implicitSizeHint( const QString& text ) const QSizeF QskPlainTextRenderer::textSize( const QString& text ) const
{ {
// result differs from QskTextRenderer::implicitSizeHint ??? // result differs from QskTextRenderer::implicitSizeHint ???
return textRect( QSizeF( 10e6, 10e6 ), text ).size(); return textRect( QSizeF( 10e6, 10e6 ), text ).size();

3
src/nodes/QskPlainTextRenderer.h
View File

@ -38,8 +38,7 @@ public:
static void updateNodeColor( QSGNode* parentNode, static void updateNodeColor( QSGNode* parentNode,
const QColor& textColor, Qsk::TextStyle, const QColor& styleColor ); 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; QRectF textRect( const QSizeF&, const QString& ) const;
private: private:

1
src/nodes/QskTextNode.cpp
View File

@ -7,6 +7,7 @@
#include "QskTextOptions.h" #include "QskTextOptions.h"
#include <QFont> #include <QFont>
#include <QColor>
#include <QString> #include <QString>
QskTextNode::QskTextNode(): QskTextNode::QskTextNode():

5
src/nodes/QskTextNode.h
View File

@ -10,7 +10,6 @@
#include "QskNamespace.h" #include "QskNamespace.h"
#include <QSGTransformNode> #include <QSGTransformNode>
#include <QColor>
#include <Qt> #include <Qt>
class QskTextOptions; class QskTextOptions;
@ -27,10 +26,6 @@ public:
const QColor& textColor, const QColor& styleColor, const QColor& linkColor ); const QColor& textColor, const QColor& styleColor, const QColor& linkColor );
private: private:
uint m_hash; uint m_hash;
QColor m_textRgb;
QColor m_styleRgb;
QColor m_linkRgb;
}; };
#endif #endif

2
src/nodes/QskTextRenderer.cpp
View File

@ -96,7 +96,7 @@ void QskTextRenderer::setAlignment( Qt::Alignment alignment )
m_alignment = alignment; m_alignment = alignment;
} }
QSizeF QskTextRenderer::implicitSizeHint( const QString& text ) const QSizeF QskTextRenderer::textSize( const QString& text ) const
{ {
if ( qskLayoutHelper == NULL ) if ( qskLayoutHelper == NULL )
qskLayoutHelper = new QskTextHelperItem(); qskLayoutHelper = new QskTextHelperItem();

3
src/nodes/QskTextRenderer.h
View File

@ -39,8 +39,7 @@ public:
QSGTransformNode*, const QColor& textColor, Qsk::TextStyle, QSGTransformNode*, const QColor& textColor, Qsk::TextStyle,
const QColor& styleColor, const QColor& linkColor ); const QColor& styleColor, const QColor& linkColor );
QSizeF implicitSizeHint( const QString& ) const; QSizeF textSize( const QString& ) const;
QRectF textRect( const QSizeF&, const QString& ) const; QRectF textRect( const QSizeF&, const QString& ) const;
private: private: