applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-26 17:05:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Scale Welcome image correctly, adjust layouts throughout Welcome page.

Browse source
This commit is contained in:
Teo Mrnjavac 2015-06-20 01:05:55 +02:00
parent 80c76c549f
commit b636d69a45
4 changed files with 17 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/modules/welcome/checker/CheckerWidget.cpp
View file

@ -20,9 +20,10 @@
#include "CheckItemWidget.h"
#include "Branding.h"
#include "utils/CalamaresUtilsGui.h"
#include "utils/Retranslator.h"
#include "Branding.h"
#include "widgets/FixedAspectRatioLabel.h"
#include <QAbstractButton>
#include <QBoxLayout>
@ -34,13 +35,13 @@
CheckerWidget::CheckerWidget( QWidget* parent )
: QWidget( parent )
{
setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum );
setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
QBoxLayout* mainLayout = new QVBoxLayout;
setLayout( mainLayout );
m_mainLayout = new QVBoxLayout;
setLayout( m_mainLayout );
QHBoxLayout* spacerLayout = new QHBoxLayout;
mainLayout->addLayout( spacerLayout );
m_mainLayout->addLayout( spacerLayout );
m_paddingSize = qBound( 32, CalamaresUtils::defaultFontHeight() * 4, 128 );
spacerLayout->addSpacing( m_paddingSize );
m_entriesLayout = new QVBoxLayout;
@ -128,11 +129,11 @@ CheckerWidget::init( const QList< PrepareEntry >& checkEntries )
imagePath( Calamares::Branding::ProductWelcome ) );
if ( !theImage.isNull() )
{
QLabel* imageLabel = new QLabel;
imageLabel->setContentsMargins( 4, CalamaresUtils::defaultFontHeight(), 4, 4 );
m_entriesLayout->addWidget( imageLabel );
FixedAspectRatioLabel* imageLabel = new FixedAspectRatioLabel;
imageLabel->setContentsMargins( 4, CalamaresUtils::defaultFontHeight()*0.75, 4, 4 );
m_mainLayout->addWidget( imageLabel );
imageLabel->setAlignment( Qt::AlignCenter );
imageLabel->setScaledContents( false );
imageLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
imageLabel->setPixmap( theImage );
}
@ -145,6 +146,10 @@ CheckerWidget::init( const QList< PrepareEntry >& checkEntries )
textLabel->setAlignment( Qt::AlignCenter );
)
}
else
{
m_mainLayout->addStretch();
}
}