168492376
/
qskinny
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fine-tune the layout

This commit is contained in:
Peter Hartmann 2020-09-21 16:31:36 +02:00
parent c6cd1016df
commit 295c525f82
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
examples/iot-dashboard/Humidity.cpp
View File

@ -13,7 +13,8 @@
Humidity::Humidity( QQuickItem* parent ) Humidity::Humidity( QQuickItem* parent )
: Box( "", parent ) : Box( "", parent )
{ {
setMarginsHint( Panel | QskAspect::Padding, 10 ); setMarginsHint( Panel | QskAspect::Padding, 8 );
setSizePolicy( Qt::Vertical, QskSizePolicy::Maximum );
auto* layout = new QskLinearBox( Qt::Horizontal, this ); auto* layout = new QskLinearBox( Qt::Horizontal, this );
layout->setSpacing( 20 ); layout->setSpacing( 20 );
@ -42,7 +43,8 @@ Humidity::Humidity( QQuickItem* parent )
auto* upButton = new QskPushButton( buttons ); auto* upButton = new QskPushButton( buttons );
upButton->setBoxShapeHint( QskPushButton::Panel, {30, 30, 0, 0} ); upButton->setBoxShapeHint( QskPushButton::Panel, {30, 30, 0, 0} );
upButton->setSizePolicy( QskSizePolicy::Fixed, QskSizePolicy::Expanding ); upButton->setSizePolicy( QskSizePolicy::Fixed, QskSizePolicy::Expanding );
upButton->setFixedWidth( 32 ); upButton->setFixedWidth( 42 );
upButton->setFixedHeight( 46.31 );
upButton->setGradientHint( QskPushButton::Panel, {"#f7f7f7"} ); upButton->setGradientHint( QskPushButton::Panel, {"#f7f7f7"} );
upButton->setGraphic( upGraphic ); upButton->setGraphic( upGraphic );
upButton->setGraphicSourceSize( {10, 5.71} ); upButton->setGraphicSourceSize( {10, 5.71} );
@ -53,7 +55,8 @@ Humidity::Humidity( QQuickItem* parent )
auto* downButton = new QskPushButton( buttons ); auto* downButton = new QskPushButton( buttons );
downButton->setBoxShapeHint( QskPushButton::Panel, {0, 0, 30, 30} ); downButton->setBoxShapeHint( QskPushButton::Panel, {0, 0, 30, 30} );
downButton->setSizePolicy( QskSizePolicy::Fixed, QskSizePolicy::Expanding ); downButton->setSizePolicy( QskSizePolicy::Fixed, QskSizePolicy::Expanding );
downButton->setFixedWidth( 32 ); downButton->setFixedWidth( 42 );
downButton->setFixedHeight( 46.31 );
downButton->setGradientHint( QskPushButton::Panel, {"#f7f7f7"} ); downButton->setGradientHint( QskPushButton::Panel, {"#f7f7f7"} );
downButton->setGraphic( downGraphic ); downButton->setGraphic( downGraphic );
downButton->setGraphicSourceSize( {10, 5.71} ); downButton->setGraphicSourceSize( {10, 5.71} );

11
examples/iot-dashboard/IndoorTemperature.cpp
View File

@ -13,8 +13,8 @@
IndoorTemperature::IndoorTemperature( QQuickItem* parent ) IndoorTemperature::IndoorTemperature( QQuickItem* parent )
: Box( "", parent ) : Box( "", parent )
{ {
// setBackgroundColor( Qt::transparent ); setMarginsHint( Panel | QskAspect::Padding, 8 );
setMarginsHint( Panel | QskAspect::Padding, 10 ); setSizePolicy( Qt::Vertical, QskSizePolicy::Maximum );
auto* layout = new QskLinearBox( Qt::Horizontal, this ); auto* layout = new QskLinearBox( Qt::Horizontal, this );
layout->setSpacing( 20 ); layout->setSpacing( 20 );
@ -25,6 +25,7 @@ IndoorTemperature::IndoorTemperature( QQuickItem* parent )
icon->setFixedSize( 68, 68 ); // ### fix properly icon->setFixedSize( 68, 68 ); // ### fix properly
auto* titleAndValue = new QskLinearBox( Qt::Vertical, layout ); auto* titleAndValue = new QskLinearBox( Qt::Vertical, layout );
titleAndValue->setMargins( {0, 10, 0, 0} );
auto* title = new QskTextLabel( "Indoor Temperature", titleAndValue ); auto* title = new QskTextLabel( "Indoor Temperature", titleAndValue );
title->setFontRole( DaytimeSkin::TitleFont ); title->setFontRole( DaytimeSkin::TitleFont );
@ -43,7 +44,8 @@ IndoorTemperature::IndoorTemperature( QQuickItem* parent )
auto* upButton = new QskPushButton( buttons ); auto* upButton = new QskPushButton( buttons );
upButton->setBoxShapeHint( QskPushButton::Panel, {30, 30, 0, 0} ); upButton->setBoxShapeHint( QskPushButton::Panel, {30, 30, 0, 0} );
upButton->setSizePolicy( QskSizePolicy::Fixed, QskSizePolicy::Expanding ); upButton->setSizePolicy( QskSizePolicy::Fixed, QskSizePolicy::Expanding );
upButton->setFixedWidth( 32 ); upButton->setFixedWidth( 42 );
upButton->setFixedHeight( 46.31 );
upButton->setGradientHint( QskPushButton::Panel, {"#f7f7f7"} ); upButton->setGradientHint( QskPushButton::Panel, {"#f7f7f7"} );
upButton->setGraphic( upGraphic ); upButton->setGraphic( upGraphic );
upButton->setGraphicSourceSize( {10, 5.71} ); upButton->setGraphicSourceSize( {10, 5.71} );
@ -54,7 +56,8 @@ IndoorTemperature::IndoorTemperature( QQuickItem* parent )
auto* downButton = new QskPushButton( buttons ); auto* downButton = new QskPushButton( buttons );
downButton->setBoxShapeHint( QskPushButton::Panel, {0, 0, 30, 30} ); downButton->setBoxShapeHint( QskPushButton::Panel, {0, 0, 30, 30} );
downButton->setSizePolicy( QskSizePolicy::Fixed, QskSizePolicy::Expanding ); downButton->setSizePolicy( QskSizePolicy::Fixed, QskSizePolicy::Expanding );
downButton->setFixedWidth( 32 ); downButton->setFixedWidth( 42 );
downButton->setFixedHeight( 46.31 );
downButton->setGradientHint( QskPushButton::Panel, {"#f7f7f7"} ); downButton->setGradientHint( QskPushButton::Panel, {"#f7f7f7"} );
downButton->setGraphic( downGraphic ); downButton->setGraphic( downGraphic );
downButton->setGraphicSourceSize( {10, 5.71} ); downButton->setGraphicSourceSize( {10, 5.71} );

4
examples/iot-dashboard/MainContent.cpp
View File

@ -66,7 +66,7 @@ MainContent::MainContent( QQuickItem* parent ) : QskLinearBox( Qt::Vertical, par
setAutoAddChildren( false ); setAutoAddChildren( false );
setSizePolicy( QskSizePolicy::Expanding, QskSizePolicy::Expanding ); setSizePolicy( QskSizePolicy::Expanding, QskSizePolicy::Expanding );
setDefaultAlignment( Qt::AlignTop ); setDefaultAlignment( Qt::AlignTop );
setSpacing( 30 ); setSpacing( 24 );
setBackgroundColor( "#FBFBFB" ); setBackgroundColor( "#FBFBFB" );
auto* topBar = new TopBar( this ); auto* topBar = new TopBar( this );
@ -74,7 +74,7 @@ MainContent::MainContent( QQuickItem* parent ) : QskLinearBox( Qt::Vertical, par
auto* gridBox = new QskGridBox( this ); auto* gridBox = new QskGridBox( this );
gridBox->setSpacing( 15 ); gridBox->setSpacing( 15 );
gridBox->setMargins( {15, 0, 15, 20} ); gridBox->setMargins( {15, 0, 27, 24} );
gridBox->setPanel( true ); gridBox->setPanel( true );
gridBox->setBoxShapeHint( QskBox::Panel, 6 ); gridBox->setBoxShapeHint( QskBox::Panel, 6 );
gridBox->setBoxBorderMetricsHint( QskBox::Panel, 2 ); gridBox->setBoxBorderMetricsHint( QskBox::Panel, 2 );