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

crashes fixed

This commit is contained in:
Uwe Rathmann 2022-08-29 15:42:19 +02:00
parent df5eb382f9
commit c72f4be8d6
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/layouts/QskSubcontrolLayoutEngine.cpp
View File

@ -347,7 +347,7 @@ void QskSubcontrolLayoutEngine::setGraphicTextElements( const QskSkinnable* skin
} }
TextElement* textElement = nullptr; TextElement* textElement = nullptr;
if ( !text.isEmpty() && ( graphicSubControl != QskAspect::Control ) ) if ( !text.isEmpty() && ( textSubcontrol != QskAspect::Control ) )
{ {
textElement = dynamic_cast< TextElement* >( element( textSubcontrol ) ); textElement = dynamic_cast< TextElement* >( element( textSubcontrol ) );
if ( textElement == nullptr ) if ( textElement == nullptr )
@ -445,7 +445,7 @@ QskSizePolicy QskSubcontrolLayoutEngine::sizePolicyAt( int index ) const
int QskSubcontrolLayoutEngine::count() const int QskSubcontrolLayoutEngine::count() const
{ {
return sizeof( m_data->elements ) / sizeof( m_data->elements[0] ); return m_data->elements.count();
} }
void QskSubcontrolLayoutEngine::layoutItems() void QskSubcontrolLayoutEngine::layoutItems()
@ -466,7 +466,12 @@ void QskSubcontrolLayoutEngine::layoutItems()
int QskSubcontrolLayoutEngine::effectiveCount( Qt::Orientation orientation ) const int QskSubcontrolLayoutEngine::effectiveCount( Qt::Orientation orientation ) const
{ {
return ( orientation == m_data->orientation ) ? m_data->elements.count() : 1; const auto count = m_data->elements.count();
if ( orientation == m_data->orientation )
return count;
else
return ( count >= 1 ) ? 1 : 0;
} }
QRectF QskSubcontrolLayoutEngine::subControlRect( QskAspect::Subcontrol subControl ) const QRectF QskSubcontrolLayoutEngine::subControlRect( QskAspect::Subcontrol subControl ) const