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

push buttons: Fix layouting for eliding and wrapping texts

Browse Source
This commit is contained in:
Peter Hartmann 2023-03-05 10:32:08 +01:00 committed by uwerat
parent 27f79c7c0e
commit 689f45f710
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/controls/QskPushButtonSkinlet.cpp
View File

@ -39,16 +39,10 @@ namespace
QskPushButton::Text, button->text(), QskPushButton::Text, button->text(),
QskPushButton::Graphic, button->graphic().defaultSize() ); QskPushButton::Graphic, button->graphic().defaultSize() );
const auto textOptions = button->textOptions(); const auto alignment = button->alignmentHint(
QskPushButton::Panel, Qt::AlignCenter );
if ( ( textOptions.elideMode() == Qt::ElideNone ) setFixedContent( QskPushButton::Text, Qt::Horizontal, alignment );
&& ( textOptions.wrapMode() == QskTextOptions::NoWrap ) )
{
const auto alignment = button->alignmentHint(
QskPushButton::Panel, Qt::AlignCenter );
setFixedContent( QskPushButton::Text, Qt::Horizontal, alignment );
}
} }
}; };
} }

2
src/layouts/QskSubcontrolLayoutEngine.cpp
View File

@ -413,7 +413,7 @@ void QskSubcontrolLayoutEngine::setFixedContent(
{ {
if( auto* e = element( subcontrol ) ) if( auto* e = element( subcontrol ) )
{ {
e->setSizePolicy( QskSizePolicy::Fixed, e->sizePolicy().verticalPolicy() ); e->setSizePolicy( QskSizePolicy::Maximum, e->sizePolicy().verticalPolicy() );
} }
Qt::Edges extraSpacing; Qt::Edges extraSpacing;