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

code moved to QskSubcontrolLayoutEngine

This commit is contained in:
Uwe Rathmann 2022-08-29 14:17:13 +02:00
parent 1cb0461829
commit 45e157c2c6
4 changed files with 107 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
src/controls/QskPushButtonSkinlet.cpp
View File

@ -32,66 +32,11 @@ namespace
LayoutEngine( const QskPushButton* button ) LayoutEngine( const QskPushButton* button )
: QskSubcontrolLayoutEngine( qskOrientation( button ) ) : QskSubcontrolLayoutEngine( qskOrientation( button ) )
{ {
using Q = QskPushButton; setSpacing( button->spacingHint( QskPushButton::Panel ) );
setSpacing( button->spacingHint( Q::Panel ) ); setGraphicTextElements( button,
QskPushButton::Text, button->text(),
const auto graphicSourceSize = button->graphic().defaultSize(); QskPushButton::Graphic, button->graphic().defaultSize() );
const bool hasText = !button->text().isEmpty();
const bool hasGraphic = !graphicSourceSize.isEmpty();
auto graphicElement = new GraphicElement( button, Q::Graphic );
graphicElement->setSourceSize( graphicSourceSize );
graphicElement->setIgnored( !hasGraphic );
auto textElement = new TextElement( button, Q::Text );
textElement->setText( button->text() );
textElement->setIgnored( !hasText );
using SP = QskSizePolicy;
if ( hasText && !hasGraphic )
{
textElement->setSizePolicy( SP::Preferred, SP::Constrained );
}
else if ( hasGraphic && !hasText )
{
const auto size = graphicElement->effectiveStrutSize();
if ( !size.isEmpty() )
graphicElement->setFixedSize( size );
else
graphicElement->setSizePolicy( SP::Ignored, SP::ConstrainedExpanding );
}
else if ( hasText && hasGraphic )
{
if ( orientation() == Qt::Horizontal )
{
graphicElement->setSizePolicy( SP::Constrained, SP::Fixed );
textElement->setSizePolicy( SP::Preferred, SP::Preferred );
}
else
{
graphicElement->setSizePolicy( SP::Fixed, SP::Fixed );
textElement->setSizePolicy( SP::Preferred, SP::Constrained );
}
auto size = graphicElement->effectiveStrutSize();
if ( size.isEmpty() )
{
const auto h = 1.5 * button->effectiveFontHeight( Q::Text );
size.setWidth( graphicElement->widthForHeight( h ) );
size.setHeight( h );
}
graphicElement->setPreferredSize( size );
}
setElementAt( 0, graphicElement );
setElementAt( 1, textElement );
} }
}; };
} }
@ -107,24 +52,26 @@ QskPushButtonSkinlet::~QskPushButtonSkinlet() = default;
QRectF QskPushButtonSkinlet::subControlRect( const QskSkinnable* skinnable, QRectF QskPushButtonSkinlet::subControlRect( const QskSkinnable* skinnable,
const QRectF& contentsRect, QskAspect::Subcontrol subControl ) const const QRectF& contentsRect, QskAspect::Subcontrol subControl ) const
{ {
using Q = QskPushButton;
const auto button = static_cast< const QskPushButton* >( skinnable ); const auto button = static_cast< const QskPushButton* >( skinnable );
if ( subControl == QskPushButton::Text ) if ( ( subControl == Q::Text ) || ( subControl == Q::Graphic ) )
{ {
return textRect( button, contentsRect ); const auto r = button->subControlContentsRect( contentsRect, Q::Panel );
LayoutEngine layoutEngine( button );
layoutEngine.setGeometries( r );
return layoutEngine.subControlRect( subControl );
} }
if ( subControl == QskPushButton::Graphic ) if ( subControl == Q::Panel )
{
return graphicRect( button, contentsRect );
}
if ( subControl == QskPushButton::Panel )
{ {
return contentsRect; return contentsRect;
} }
if ( subControl == QskPushButton::Ripple ) if ( subControl == Q::Ripple )
{ {
return rippleRect( button, contentsRect ); return rippleRect( button, contentsRect );
} }
@ -135,13 +82,15 @@ QRectF QskPushButtonSkinlet::subControlRect( const QskSkinnable* skinnable,
QSGNode* QskPushButtonSkinlet::updateSubNode( QSGNode* QskPushButtonSkinlet::updateSubNode(
const QskSkinnable* skinnable, quint8 nodeRole, QSGNode* node ) const const QskSkinnable* skinnable, quint8 nodeRole, QSGNode* node ) const
{ {
using Q = QskPushButton;
const auto button = static_cast< const QskPushButton* >( skinnable ); const auto button = static_cast< const QskPushButton* >( skinnable );
switch ( nodeRole ) switch ( nodeRole )
{ {
case PanelRole: case PanelRole:
{ {
return updateBoxNode( button, node, QskPushButton::Panel ); return updateBoxNode( button, node, Q::Panel );
} }
case RippleRole: case RippleRole:
@ -156,40 +105,13 @@ QSGNode* QskPushButtonSkinlet::updateSubNode(
case GraphicRole: case GraphicRole:
{ {
return updateGraphicNode( button, node, return updateGraphicNode( button, node, button->graphic(), Q::Graphic );
button->graphic(), QskPushButton::Graphic );
} }
} }
return Inherited::updateSubNode( skinnable, nodeRole, node ); return Inherited::updateSubNode( skinnable, nodeRole, node );
} }
QRectF QskPushButtonSkinlet::textRect(
const QskPushButton* button, const QRectF& contentsRect ) const
{
using Q = QskPushButton;
const auto r = button->subControlContentsRect( contentsRect, Q::Panel );
LayoutEngine layoutEngine( button );
layoutEngine.setGeometries( r );
return layoutEngine.elementAt( 1 )->geometry();
}
QRectF QskPushButtonSkinlet::graphicRect(
const QskPushButton* button, const QRectF& contentsRect ) const
{
using Q = QskPushButton;
const auto r = button->subControlContentsRect( contentsRect, Q::Panel );
LayoutEngine layoutEngine( button );
layoutEngine.setGeometries( r );
return layoutEngine.elementAt( 0 )->geometry();
}
QRectF QskPushButtonSkinlet::rippleRect( QRectF QskPushButtonSkinlet::rippleRect(
const QskPushButton* button, const QRectF& contentsRect ) const const QskPushButton* button, const QRectF& contentsRect ) const
{ {

2
src/controls/QskPushButtonSkinlet.h
View File

@ -41,8 +41,6 @@ class QSK_EXPORT QskPushButtonSkinlet : public QskSkinlet
quint8 nodeRole, QSGNode* ) const override; quint8 nodeRole, QSGNode* ) const override;
private: private:
QRectF textRect( const QskPushButton*, const QRectF& ) const;
QRectF graphicRect( const QskPushButton*, const QRectF& ) const;
QRectF rippleRect( const QskPushButton*, const QRectF& ) const; QRectF rippleRect( const QskPushButton*, const QRectF& ) const;
QSGNode* updateTextNode( const QskPushButton*, QSGNode* ) const; QSGNode* updateTextNode( const QskPushButton*, QSGNode* ) const;

80
src/layouts/QskSubcontrolLayoutEngine.cpp
View File

@ -322,6 +322,66 @@ qreal QskSubcontrolLayoutEngine::spacing() const
return Inherited::spacing( m_data->orientation ); return Inherited::spacing( m_data->orientation );
} }
void QskSubcontrolLayoutEngine::setGraphicTextElements( const QskSkinnable* skinnable,
QskAspect::Subcontrol textSubcontrol, const QString& text,
QskAspect::Subcontrol graphicSubControl, const QSizeF& graphicSize )
{
const bool hasText = !text.isEmpty();
const bool hasGraphic = !graphicSize.isEmpty();
auto graphicElement = new GraphicElement( skinnable, graphicSubControl );
graphicElement->setSourceSize( graphicSize );
graphicElement->setIgnored( !hasGraphic );
auto textElement = new TextElement( skinnable, textSubcontrol );
textElement->setText( text );
textElement->setIgnored( !hasText );
using SP = QskSizePolicy;
if ( hasText && !hasGraphic )
{
textElement->setSizePolicy( SP::Preferred, SP::Constrained );
}
else if ( hasGraphic && !hasText )
{
const auto size = graphicElement->effectiveStrutSize();
if ( !size.isEmpty() )
graphicElement->setFixedSize( size );
else
graphicElement->setSizePolicy( SP::Ignored, SP::ConstrainedExpanding );
}
else if ( hasText && hasGraphic )
{
if ( orientation() == Qt::Horizontal )
{
graphicElement->setSizePolicy( SP::Constrained, SP::Fixed );
textElement->setSizePolicy( SP::Preferred, SP::Preferred );
}
else
{
graphicElement->setSizePolicy( SP::Fixed, SP::Fixed );
textElement->setSizePolicy( SP::Preferred, SP::Constrained );
}
auto size = graphicElement->effectiveStrutSize();
if ( size.isEmpty() )
{
const auto h = 1.5 * skinnable->effectiveFontHeight( textSubcontrol );
size.setWidth( graphicElement->widthForHeight( h ) );
size.setHeight( h );
}
graphicElement->setPreferredSize( size );
}
setElementAt( 0, graphicElement );
setElementAt( 1, textElement );
}
void QskSubcontrolLayoutEngine::setElementAt( int index, LayoutElement* element ) void QskSubcontrolLayoutEngine::setElementAt( int index, LayoutElement* element )
{ {
if ( index >= 0 && index < count() ) if ( index >= 0 && index < count() )
@ -339,6 +399,18 @@ QskSubcontrolLayoutEngine::LayoutElement* QskSubcontrolLayoutEngine::elementAt(
return nullptr; return nullptr;
} }
QskSubcontrolLayoutEngine::LayoutElement* QskSubcontrolLayoutEngine::element(
QskAspect::Subcontrol subControl ) const
{
for ( auto element : m_data->elements )
{
if ( element->subControl() == subControl )
return element;
}
return nullptr;
}
QskSizePolicy QskSubcontrolLayoutEngine::sizePolicyAt( int index ) const QskSizePolicy QskSubcontrolLayoutEngine::sizePolicyAt( int index ) const
{ {
if ( index >= 0 && index < count() ) if ( index >= 0 && index < count() )
@ -380,6 +452,14 @@ int QskSubcontrolLayoutEngine::effectiveCount( Qt::Orientation orientation ) con
return ( orientation == m_data->orientation ) ? 2 : 1; return ( orientation == m_data->orientation ) ? 2 : 1;
} }
QRectF QskSubcontrolLayoutEngine::subControlRect( QskAspect::Subcontrol subControl ) const
{
if ( const auto el = element( subControl ) )
return el->geometry();
return QRectF( 0.0, 0.0, -1.0, -1.0 ); // something invalid
}
void QskSubcontrolLayoutEngine::invalidateElementCache() void QskSubcontrolLayoutEngine::invalidateElementCache()
{ {
} }

8
src/layouts/QskSubcontrolLayoutEngine.h
View File

@ -124,8 +124,16 @@ class QskSubcontrolLayoutEngine : public QskLayoutEngine2D
void setElementAt( int index, LayoutElement* ); void setElementAt( int index, LayoutElement* );
LayoutElement* elementAt( int ) const; LayoutElement* elementAt( int ) const;
LayoutElement* element( QskAspect::Subcontrol ) const;
int count() const override final; int count() const override final;
void setGraphicTextElements( const QskSkinnable*,
QskAspect::Subcontrol, const QString& text,
QskAspect::Subcontrol, const QSizeF& graphicSize );
QRectF subControlRect( QskAspect::Subcontrol ) const;
private: private:
QskSizePolicy sizePolicyAt( int index ) const override; QskSizePolicy sizePolicyAt( int index ) const override;
void layoutItems() override; void layoutItems() override;