From 98751d1ae0eb21c4a12b50b43948fd6fded6c0ec Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Fri, 26 Mar 2021 10:38:27 +0100 Subject: [PATCH] more size hints --- examples/iot-dashboard/DaytimeSkin.cpp | 1 + examples/iot-dashboard/MainWindow.cpp | 2 ++ examples/iot-dashboard/MenuBar.cpp | 2 +- examples/iot-dashboard/NighttimeSkin.cpp | 13 +++++++++---- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/examples/iot-dashboard/DaytimeSkin.cpp b/examples/iot-dashboard/DaytimeSkin.cpp index 59929c47..186333f0 100644 --- a/examples/iot-dashboard/DaytimeSkin.cpp +++ b/examples/iot-dashboard/DaytimeSkin.cpp @@ -60,6 +60,7 @@ void DaytimeSkin::initHints() ed.setPadding( MenuBar::Panel, {0, 35, 0, 12} ); ed.setGradient( MenuBar::Panel, {"#6D7BFB"} ); + ed.setStrutSize( MenuItem::Panel | QskAspect::Size, {140, 40} ); ed.setPadding( MenuItem::Panel, {30, 0, 30, 0} ); QColor color( Qt::white ); color.setAlphaF( 0.09 ); diff --git a/examples/iot-dashboard/MainWindow.cpp b/examples/iot-dashboard/MainWindow.cpp index 5168dae0..9c8e95e5 100644 --- a/examples/iot-dashboard/MainWindow.cpp +++ b/examples/iot-dashboard/MainWindow.cpp @@ -13,4 +13,6 @@ MainWindow::MainWindow() { setPreferredSize( { 1024, 600 } ); setTitle( "IOT dashboard" ); + + m_mainLayout->setSpacing( 0 ); } diff --git a/examples/iot-dashboard/MenuBar.cpp b/examples/iot-dashboard/MenuBar.cpp index f9fb27ef..ad3742f7 100644 --- a/examples/iot-dashboard/MenuBar.cpp +++ b/examples/iot-dashboard/MenuBar.cpp @@ -15,7 +15,7 @@ MenuItem::MenuItem( const QString& name, QQuickItem* parent ) : QskLinearBox( Qt { setAutoLayoutChildren( true ); setAutoAddChildren( true ); - setFixedSize( {140, 40} ); + setSizePolicy( QskSizePolicy::Fixed, QskSizePolicy::Fixed ); setSpacing( 6 ); setAcceptHoverEvents( true ); diff --git a/examples/iot-dashboard/NighttimeSkin.cpp b/examples/iot-dashboard/NighttimeSkin.cpp index 03b8366e..c3e9d526 100644 --- a/examples/iot-dashboard/NighttimeSkin.cpp +++ b/examples/iot-dashboard/NighttimeSkin.cpp @@ -57,6 +57,15 @@ void NighttimeSkin::initHints() QskSkinHintTableEditor ed( &hintTable() ); + ed.setPadding( MenuBar::Panel, {0, 35, 0, 12} ); + ed.setGradient( MenuBar::Panel, {"#2937A7"} ); + + ed.setStrutSize( MenuItem::Panel | QskAspect::Size, {140, 40} ); + ed.setPadding( MenuItem::Panel, {30, 0, 30, 0} ); + QColor color( Qt::white ); + color.setAlphaF( 0.09 ); + ed.setGradient( MenuItem::Panel | QskControl::Hovered, color ); + ed.setGradient( MainContent::Panel, {"#040404"} ); ed.setGradient( Box::Panel, {"#000000"} ); ed.setColor( LightDisplay::Panel, "#000000" ); @@ -65,8 +74,4 @@ void NighttimeSkin::initHints() ed.setBoxBorderColors( WeekdayBox::Panel, {"#0c0c0c"} ); ed.setColor( QskTextLabel::Text, "#ffffff" ); - - QColor color( Qt::white ); - color.setAlphaF( 0.09 ); - ed.setGradient( MenuItem::Panel | QskControl::Hovered, color ); }