napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[partition] Resize combo box to show whole pop-up

Browse Source 
The (collapsed) combo box should be wide enough to show the
entire pop-up (expanded) box data.

FIXES #1700
This commit is contained in:
Adriaan de Groot 2021-06-08 14:09:31 +02:00
parent eb627bc055
commit df634573bf
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/modules/partition/gui/ChoicePage.cpp
View File

@ -134,6 +134,28 @@ ChoicePage::ChoicePage( Config* config, QWidget* parent )
ChoicePage::~ChoicePage() {}
/** @brief Sets the @p model for the given @p box and adjusts UI sizes to match.
*
* The model provides data for drawing the items in the model; the
* drawing itself is done by the delegate, which may end up drawing a
* different width in the popup than in the collapsed combo box.
*
* Make the box wide enough to accomodate the whole expanded delegate;
* this avoids cases where the popup would truncate data being drawn
* because the overall box is sized too narrow.
*/
void setModelToComboBox( QComboBox* box, QAbstractItemModel* model )
{
box->setModel( model );
if ( model->rowCount() > 0 )
{
QStyleOptionViewItem options;
options.initFrom( box );
auto delegateSize = box->itemDelegate()->sizeHint(options, model->index(0, 0) );
box->setMinimumWidth( delegateSize.width() );
}
}
void
ChoicePage::init( PartitionCoreModule* core )
{
@ -145,10 +167,10 @@ ChoicePage::init( PartitionCoreModule* core )
// We need to do this because a PCM revert invalidates the deviceModel.
connect( core, &PartitionCoreModule::reverted, this, [=] {
m_drivesCombo->setModel( core->deviceModel() );
setModelToComboBox( m_drivesCombo, core->deviceModel() );
m_drivesCombo->setCurrentIndex( m_lastSelectedDeviceIndex );
} );
m_drivesCombo->setModel( core->deviceModel() );
setModelToComboBox( m_drivesCombo, core->deviceModel() );
connect( m_drivesCombo,
static_cast< void ( QComboBox::* )( int ) >( &QComboBox::currentIndexChanged ),