From 295c525f823575e9d97726d5391c2bca3780470f Mon Sep 17 00:00:00 2001
From: Peter Hartmann <peter@edelhirsch.io>
Date: Mon, 21 Sep 2020 16:31:36 +0200
Subject: [PATCH] fine-tune the layout

---
 examples/iot-dashboard/Humidity.cpp          |  9 ++++++---
 examples/iot-dashboard/IndoorTemperature.cpp | 11 +++++++----
 examples/iot-dashboard/MainContent.cpp       |  4 ++--
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/examples/iot-dashboard/Humidity.cpp b/examples/iot-dashboard/Humidity.cpp
index a75b0478..6d380c6f 100644
--- a/examples/iot-dashboard/Humidity.cpp
+++ b/examples/iot-dashboard/Humidity.cpp
@@ -13,7 +13,8 @@
 Humidity::Humidity( QQuickItem* 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 );
     layout->setSpacing( 20 );
@@ -42,7 +43,8 @@ Humidity::Humidity( QQuickItem* parent )
     auto* upButton = new QskPushButton( buttons );
     upButton->setBoxShapeHint( QskPushButton::Panel, {30, 30, 0, 0} );
     upButton->setSizePolicy( QskSizePolicy::Fixed, QskSizePolicy::Expanding );
-    upButton->setFixedWidth( 32 );
+    upButton->setFixedWidth( 42 );
+    upButton->setFixedHeight( 46.31 );
     upButton->setGradientHint( QskPushButton::Panel, {"#f7f7f7"} );
     upButton->setGraphic( upGraphic );
     upButton->setGraphicSourceSize( {10, 5.71} );
@@ -53,7 +55,8 @@ Humidity::Humidity( QQuickItem* parent )
     auto* downButton = new QskPushButton( buttons );
     downButton->setBoxShapeHint( QskPushButton::Panel, {0, 0, 30, 30} );
     downButton->setSizePolicy( QskSizePolicy::Fixed, QskSizePolicy::Expanding );
-    downButton->setFixedWidth( 32 );
+    downButton->setFixedWidth( 42 );
+    downButton->setFixedHeight( 46.31 );
     downButton->setGradientHint( QskPushButton::Panel, {"#f7f7f7"} );
     downButton->setGraphic( downGraphic );
     downButton->setGraphicSourceSize( {10, 5.71} );
diff --git a/examples/iot-dashboard/IndoorTemperature.cpp b/examples/iot-dashboard/IndoorTemperature.cpp
index 580a7710..a3af8309 100644
--- a/examples/iot-dashboard/IndoorTemperature.cpp
+++ b/examples/iot-dashboard/IndoorTemperature.cpp
@@ -13,8 +13,8 @@
 IndoorTemperature::IndoorTemperature( QQuickItem* parent )
     : Box( "", parent )
 {
-//    setBackgroundColor( Qt::transparent );
-    setMarginsHint( Panel | QskAspect::Padding, 10 );
+    setMarginsHint( Panel | QskAspect::Padding, 8 );
+    setSizePolicy( Qt::Vertical, QskSizePolicy::Maximum );
 
     auto* layout = new QskLinearBox( Qt::Horizontal, this );
     layout->setSpacing( 20 );
@@ -25,6 +25,7 @@ IndoorTemperature::IndoorTemperature( QQuickItem* parent )
     icon->setFixedSize( 68, 68 ); // ### fix properly
 
     auto* titleAndValue = new QskLinearBox( Qt::Vertical, layout );
+    titleAndValue->setMargins( {0, 10, 0, 0} );
 
     auto* title = new QskTextLabel( "Indoor Temperature", titleAndValue );
     title->setFontRole( DaytimeSkin::TitleFont );
@@ -43,7 +44,8 @@ IndoorTemperature::IndoorTemperature( QQuickItem* parent )
     auto* upButton = new QskPushButton( buttons );
     upButton->setBoxShapeHint( QskPushButton::Panel, {30, 30, 0, 0} );
     upButton->setSizePolicy( QskSizePolicy::Fixed, QskSizePolicy::Expanding );
-    upButton->setFixedWidth( 32 );
+    upButton->setFixedWidth( 42 );
+    upButton->setFixedHeight( 46.31 );
     upButton->setGradientHint( QskPushButton::Panel, {"#f7f7f7"} );
     upButton->setGraphic( upGraphic );
     upButton->setGraphicSourceSize( {10, 5.71} );
@@ -54,7 +56,8 @@ IndoorTemperature::IndoorTemperature( QQuickItem* parent )
     auto* downButton = new QskPushButton( buttons );
     downButton->setBoxShapeHint( QskPushButton::Panel, {0, 0, 30, 30} );
     downButton->setSizePolicy( QskSizePolicy::Fixed, QskSizePolicy::Expanding );
-    downButton->setFixedWidth( 32 );
+    downButton->setFixedWidth( 42 );
+    downButton->setFixedHeight( 46.31 );
     downButton->setGradientHint( QskPushButton::Panel, {"#f7f7f7"} );
     downButton->setGraphic( downGraphic );
     downButton->setGraphicSourceSize( {10, 5.71} );
diff --git a/examples/iot-dashboard/MainContent.cpp b/examples/iot-dashboard/MainContent.cpp
index 102d1830..be4a0cd4 100644
--- a/examples/iot-dashboard/MainContent.cpp
+++ b/examples/iot-dashboard/MainContent.cpp
@@ -66,7 +66,7 @@ MainContent::MainContent( QQuickItem* parent ) : QskLinearBox( Qt::Vertical, par
     setAutoAddChildren( false );
     setSizePolicy( QskSizePolicy::Expanding, QskSizePolicy::Expanding );
     setDefaultAlignment( Qt::AlignTop );
-    setSpacing( 30 );
+    setSpacing( 24 );
     setBackgroundColor( "#FBFBFB" );
 
     auto* topBar = new TopBar( this );
@@ -74,7 +74,7 @@ MainContent::MainContent( QQuickItem* parent ) : QskLinearBox( Qt::Vertical, par
 
     auto* gridBox = new QskGridBox( this );
     gridBox->setSpacing( 15 );
-    gridBox->setMargins( {15, 0, 15, 20} );
+    gridBox->setMargins( {15, 0, 27, 24} );
     gridBox->setPanel( true );
     gridBox->setBoxShapeHint( QskBox::Panel, 6 );
     gridBox->setBoxBorderMetricsHint( QskBox::Panel, 2 );