1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
--- a/src/calamares/CalamaresWindow.cpp
+++ b/src/calamares/CalamaresWindow.cpp
@@ -294,8 +294,8 @@
// which seems to match what the widget navigation would use for height
// (with *my* specific screen, style, etc. so YMMV).
//
- // Bound between (16, 64) with a default of 48.
- qreal minimumHeight = qBound( qreal( 16 ), w->rootObject() ? w->rootObject()->height() : 48, qreal( 64 ) );
+ // Bound between (16, 96) with a default of 48.
+ qreal minimumHeight = qBound( qreal( 16 ), w->rootObject() ? w->rootObject()->height() : 48, qreal( 96 ) );
w->setMinimumHeight( int( minimumHeight ) );
w->setFixedHeight( int( minimumHeight ) );
}
@@ -500,7 +500,9 @@
baseWidget,
::getWidgetSidebar,
::getQmlSidebar,
- qBound( 100, Calamares::defaultFontHeight() * 12, w < windowPreferredWidth ? 100 : 190 ) );
+ branding->sidebarFlavor() == Calamares::Branding::PanelFlavor::Qml
+ ? 240
+ : qBound( 100, Calamares::defaultFontHeight() * 12, w < windowPreferredWidth ? 100 : 190 ) );
QWidget* navigation = flavoredWidget( branding->navigationFlavor(),
::orientation( branding->navigationSide() ),
m_debugManager,
@@ -536,6 +538,21 @@
Calamares::unmarginLayout( contentsLayout );
baseWidget->setLayout( mainLayout );
setStyleSheet( Calamares::Branding::instance()->stylesheet() );
+
+ auto panelekElsoLepesnel = [ this, sideBox, navigation ]()
+ {
+ const bool latszik = m_viewManager->currentStepIndex() > 0;
+ if ( sideBox )
+ {
+ sideBox->setVisible( latszik );
+ }
+ if ( navigation )
+ {
+ navigation->setVisible( latszik );
+ }
+ };
+ connect( m_viewManager, &Calamares::ViewManager::currentStepChanged, this, panelekElsoLepesnel );
+ panelekElsoLepesnel();
}
void
|