From 8115f19fc1e343f9ec4a06ebf9b38115896e5ef2 Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Fri, 26 Mar 2021 17:35:53 +0100 Subject: [PATCH] top bar styling --- examples/iot-dashboard/Skin.cpp | 3 +++ examples/iot-dashboard/TopBar.cpp | 4 +++- examples/iot-dashboard/TopBar.h | 13 +++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/examples/iot-dashboard/Skin.cpp b/examples/iot-dashboard/Skin.cpp index 81209929..440487d5 100644 --- a/examples/iot-dashboard/Skin.cpp +++ b/examples/iot-dashboard/Skin.cpp @@ -8,6 +8,7 @@ #include "QskShadowedRectangle.h" #include "QskShadowedRectangleSkinlet.h" #include "PieChartPainted.h" +#include "TopBar.h" #include "UpAndDownButton.h" #include @@ -73,6 +74,8 @@ void Skin::initHints( const Palette& palette ) ed.setPadding( MainContentGridBox::Panel, {19, 0, 27, 24} ); + ed.setPadding( TopBar::Panel, {25, 35, 25, 0} ); + ed.setColor( MenuBarLabel::Text, Qt::white ); ed.setFontRole( MenuBarLabel::Text, QskSkin::SmallFont ); diff --git a/examples/iot-dashboard/TopBar.cpp b/examples/iot-dashboard/TopBar.cpp index fdd79aba..bea3f9a0 100644 --- a/examples/iot-dashboard/TopBar.cpp +++ b/examples/iot-dashboard/TopBar.cpp @@ -6,6 +6,8 @@ #include +QSK_SUBCONTROL( TopBar, Panel ) + TopBarItem::TopBarItem( const QString& name, const QColor& textColor, const QGradient& gradient, int progress, int value, QQuickItem* parent ) : QskLinearBox( Qt::Vertical, parent ), m_name( name ) { @@ -32,10 +34,10 @@ TopBarItem::TopBarItem( const QString& name, const QColor& textColor, const QGra TopBar::TopBar( QQuickItem* parent ) : QskLinearBox( Qt::Horizontal, parent ) { + setPanel( true ); setAutoLayoutChildren( true ); setAutoAddChildren( true ); setSizePolicy( QskSizePolicy::Preferred, QskSizePolicy::Fixed ); - setMargins( {25, 35, 25, 0} ); QStringList itemStrings = { "Living Room", "Bedroom", "Bathroom", "Kitchen" }; QColor textColors[] = {"#ff3122", "#6776ff", "#f99055", "#6776ff"}; diff --git a/examples/iot-dashboard/TopBar.h b/examples/iot-dashboard/TopBar.h index 7af876f3..e7f3510d 100644 --- a/examples/iot-dashboard/TopBar.h +++ b/examples/iot-dashboard/TopBar.h @@ -19,8 +19,21 @@ class TopBar : public QskLinearBox Q_OBJECT public: + QSK_SUBCONTROLS( Panel ) + TopBar( QQuickItem* parent ); + QskAspect::Subcontrol effectiveSubcontrol( + QskAspect::Subcontrol subControl ) const override final + { + if( subControl == QskLinearBox::Panel ) + { + return Panel; + } + + return subControl; + } + private: QList< TopBarItem* > m_entries; };