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

[calamares] Layout-wranging

Browse Source 
- the navigation bar was set "too tall", leave it at the natural
  layout height for this widget
- margins needed some massaging to give contents some more space
  (contents has a margin, so it doesn't need more space above
  the navigation bar)
This commit is contained in:
Adriaan de Groot 2020-04-17 11:38:07 +02:00
parent ade623f6b8
commit 2a4c74c099
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/calamares/CalamaresWindow.cpp
View File

@ -207,6 +207,7 @@ CalamaresWindow::getWidgetNavigation()
bottomLayout->addWidget( quit ); bottomLayout->addWidget( quit );
} }
bottomLayout->setContentsMargins( 0, 0, 6, 6 );
navigation->setLayout( bottomLayout ); navigation->setLayout( bottomLayout );
return navigation; return navigation;
} }
@ -220,6 +221,7 @@ CalamaresWindow::getQmlNavigation()
w->setResizeMode( QQuickWidget::SizeRootObjectToView ); w->setResizeMode( QQuickWidget::SizeRootObjectToView );
w->setSource( QUrl( w->setSource( QUrl(
CalamaresUtils::searchQmlFile( CalamaresUtils::QmlSearch::Both, QStringLiteral( "calamares-navigation" ) ) ) ); CalamaresUtils::searchQmlFile( CalamaresUtils::QmlSearch::Both, QStringLiteral( "calamares-navigation" ) ) ) );
w->setMinimumHeight( 30 ); // matchine the default widgets version
return w; return w;
} }
@ -259,14 +261,6 @@ insertIf( QBoxLayout* layout,
{ {
if ( first && side == firstSide ) if ( first && side == firstSide )
{ {
if ( ( side == Calamares::Branding::PanelSide::Left ) || ( side == Calamares::Branding::PanelSide::Right ) )
{
first->setMinimumWidth( qMax( first->minimumWidth(), 64 ) );
}
else
{
first->setMinimumHeight( qMax( first->minimumHeight(), 64 ) );
}
layout->addWidget( first ); layout->addWidget( first );
} }
} }
@ -329,8 +323,7 @@ CalamaresWindow::CalamaresWindow( QWidget* parent )
QBoxLayout* mainLayout = new QHBoxLayout; QBoxLayout* mainLayout = new QHBoxLayout;
QBoxLayout* contentsLayout = new QVBoxLayout; QBoxLayout* contentsLayout = new QVBoxLayout;
contentsLayout->setSpacing( 0 );
setLayout( mainLayout );
QWidget* sideBox = flavoredWidget( QWidget* sideBox = flavoredWidget(
branding->sidebarFlavor(), branding->sidebarFlavor(),
@ -358,6 +351,7 @@ CalamaresWindow::CalamaresWindow( QWidget* parent )
CalamaresUtils::unmarginLayout( mainLayout ); CalamaresUtils::unmarginLayout( mainLayout );
CalamaresUtils::unmarginLayout( contentsLayout ); CalamaresUtils::unmarginLayout( contentsLayout );
setLayout( mainLayout );
setStyleSheet( Calamares::Branding::instance()->stylesheet() ); setStyleSheet( Calamares::Branding::instance()->stylesheet() );
} }