From 221a79b64c5dc1bcc9feedc01d7d4c756a403793 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 28 Jan 2020 13:58:08 +0100 Subject: [PATCH] [welcome] Simplify logic - \not mandatorySatisfied \implies \not requirementsSatisfied, so the ifs can be combined and simplified --- src/modules/welcome/checker/ResultsListWidget.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/modules/welcome/checker/ResultsListWidget.cpp b/src/modules/welcome/checker/ResultsListWidget.cpp index f8fe5d1a6..5a936b1a0 100644 --- a/src/modules/welcome/checker/ResultsListWidget.cpp +++ b/src/modules/welcome/checker/ResultsListWidget.cpp @@ -215,9 +215,9 @@ ResultsListWidget::ResultsListWidget( QWidget* parent, const Calamares::Requirem "might be disabled." ); m_explanation->setText( message.arg( *Calamares::Branding::ShortVersionedName ) ); ) } + mainLayout->addStretch(); } - - if ( requirementsSatisfied && mandatorySatisfied ) + else { if ( !Calamares::Branding::instance()->imagePath( Calamares::Branding::ProductWelcome ).isEmpty() ) { @@ -249,10 +249,6 @@ ResultsListWidget::ResultsListWidget( QWidget* parent, const Calamares::Requirem .arg( *Calamares::Branding::ProductName ) ); m_explanation->setAlignment( Qt::AlignCenter ); ) } - else - { - mainLayout->addStretch(); - } CALAMARES_RETRANSLATE_SLOT( &ResultsListWidget::retranslate ) retranslate();