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

[calamares] Warnings--

Browse Source 
- Set the width of the QML sidebar explicitly
- Handle all sidebar-flavor enum values explicitly
This commit is contained in:
Adriaan de Groot 2020-03-18 10:37:36 +01:00
parent 948ecb4fd1
commit 3f87cc214a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calamares/CalamaresWindow.cpp
View File

@ -136,6 +136,8 @@ CalamaresWindow::getQmlSidebar( int desiredWidth )
{ {
CalamaresUtils::registerCalamaresModels(); CalamaresUtils::registerCalamaresModels();
QQuickWidget* w = new QQuickWidget( this ); QQuickWidget* w = new QQuickWidget( this );
w->setFixedWidth( desiredWidth );
w->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
w->setSource( QUrl( w->setSource( QUrl(
CalamaresUtils::searchQmlFile( CalamaresUtils::QmlSearch::Both, QStringLiteral( "calamares-sidebar" ) ) ) ); CalamaresUtils::searchQmlFile( CalamaresUtils::QmlSearch::Both, QStringLiteral( "calamares-sidebar" ) ) ) );
return w; return w;
@ -197,7 +199,7 @@ CalamaresWindow::CalamaresWindow( QWidget* parent )
sideBox = getQmlSidebar( sideBox = getQmlSidebar(
qBound( 100, CalamaresUtils::defaultFontHeight() * 12, w < windowPreferredWidth ? 100 : 190 ) ); qBound( 100, CalamaresUtils::defaultFontHeight() * 12, w < windowPreferredWidth ? 100 : 190 ) );
break; break;
default: case Calamares::Branding::SidebarFlavor::None:
sideBox = nullptr; sideBox = nullptr;
} }
if ( sideBox ) if ( sideBox )