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

[summary][calamares] Chase deprecations in Qt (QWidget::background())

Browse Source
This commit is contained in:
Adriaan de Groot 2019-11-28 23:31:00 +01:00
parent a70b7ad89e
commit bd5b63b02e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calamares/progresstree/ProgressTreeDelegate.cpp
View File

@ -96,7 +96,7 @@ ProgressTreeDelegate::paintViewStep( QPainter* painter,
= Calamares::Branding::instance()->styleString( Calamares::Branding::SidebarTextHighlight ); = Calamares::Branding::instance()->styleString( Calamares::Branding::SidebarTextHighlight );
if ( textHighlight.isEmpty() ) if ( textHighlight.isEmpty() )
{ {
painter->setBrush( CalamaresApplication::instance()->mainWindow()->palette().background() ); painter->setBrush( CalamaresApplication::instance()->mainWindow()->palette().window() );
} }
else else
{ {

2
src/modules/summary/SummaryPage.cpp
View File

@ -184,7 +184,7 @@ SummaryPage::createBodyLabel( const QString& text ) const
QLabel* label = new QLabel; QLabel* label = new QLabel;
label->setMargin( CalamaresUtils::defaultFontHeight() / 2 ); label->setMargin( CalamaresUtils::defaultFontHeight() / 2 );
QPalette pal( palette() ); QPalette pal( palette() );
pal.setColor( QPalette::Background, palette().background().color().lighter( 108 ) ); pal.setColor( QPalette::Background, palette().window().color().lighter( 108 ) );
label->setAutoFillBackground( true ); label->setAutoFillBackground( true );
label->setPalette( pal ); label->setPalette( pal );
label->setText( text ); label->setText( text );