From 0f756c7167d31683594409048ee7d5d624b154bd Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Wed, 10 Feb 2016 17:02:42 +0100 Subject: [PATCH] Use it in ChoicePage. --- src/modules/partition/gui/ChoicePage.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index e836ae7c4..53d1c6ec4 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -661,6 +661,11 @@ ChoicePage::updateActionChoicePreview( ChoicePage::Choice choice ) CalamaresUtils::unmarginLayout( layout ); layout->setSpacing( 6 ); + PartitionBarsView::NestedPartitionsMode mode = Calamares::JobQueue::instance()->globalStorage()-> + value( "drawNestedPartitions" ).toBool() ? + PartitionBarsView::DrawNestedPartitions : + PartitionBarsView::NoNestedPartitions; + switch ( choice ) { case Alongside: @@ -671,7 +676,7 @@ ChoicePage::updateActionChoicePreview( ChoicePage::Choice choice ) m_selectLabel->show(); m_afterPartitionSplitterWidget = new PartitionSplitterWidget( m_previewAfterFrame ); - m_afterPartitionSplitterWidget->init( selectedDevice() ); + m_afterPartitionSplitterWidget->init( selectedDevice(), mode == PartitionBarsView::DrawNestedPartitions ); layout->addWidget( m_afterPartitionSplitterWidget ); QLabel* sizeLabel = new QLabel( m_previewAfterFrame ); @@ -706,10 +711,6 @@ ChoicePage::updateActionChoicePreview( ChoicePage::Choice choice ) case Replace: { m_previewBeforeLabel->setText( tr( "Current:" ) ); - PartitionBarsView::NestedPartitionsMode mode = Calamares::JobQueue::instance()->globalStorage()-> - value( "drawNestedPartitions" ).toBool() ? - PartitionBarsView::DrawNestedPartitions : - PartitionBarsView::NoNestedPartitions; m_afterPartitionBarsView = new PartitionBarsView( m_previewAfterFrame ); m_afterPartitionBarsView->setNestedPartitionsMode( mode ); m_afterPartitionLabelsView = new PartitionLabelsView( m_previewAfterFrame );