Fix Humidity
This commit is contained in:
parent
70bf3ed08b
commit
7fe4f76d75
|
@ -11,7 +11,7 @@ QSK_SUBCONTROL( BoxWithButtons, Panel )
|
||||||
QSK_SUBCONTROL( IndoorTemperature, Panel )
|
QSK_SUBCONTROL( IndoorTemperature, Panel )
|
||||||
QSK_SUBCONTROL( Humidity, Panel )
|
QSK_SUBCONTROL( Humidity, Panel )
|
||||||
|
|
||||||
BoxWithButtons::BoxWithButtons( const QString& title, bool isBright, QQuickItem* parent )
|
BoxWithButtons::BoxWithButtons( const QString& title, const QString& value, bool isBright, QQuickItem* parent )
|
||||||
: Box( "", parent )
|
: Box( "", parent )
|
||||||
{
|
{
|
||||||
setPanel( true );
|
setPanel( true );
|
||||||
|
@ -30,9 +30,9 @@ BoxWithButtons::BoxWithButtons( const QString& title, bool isBright, QQuickItem*
|
||||||
auto* titleLabel = new QskTextLabel( title, titleAndValue );
|
auto* titleLabel = new QskTextLabel( title, titleAndValue );
|
||||||
titleLabel->setFontRole( Skin::TitleFont );
|
titleLabel->setFontRole( Skin::TitleFont );
|
||||||
|
|
||||||
auto* value = new QskTextLabel( "+24", titleAndValue );
|
auto* valueLabel = new QskTextLabel( value, titleAndValue );
|
||||||
value->setFontRole( QskSkin::HugeFont );
|
valueLabel->setFontRole( QskSkin::HugeFont );
|
||||||
value->setTextColor( "#929CB2" );
|
valueLabel->setTextColor( "#929CB2" );
|
||||||
|
|
||||||
new UpAndDownButton( layout );
|
new UpAndDownButton( layout );
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,7 +11,7 @@ class BoxWithButtons : public Box
|
||||||
public:
|
public:
|
||||||
QSK_SUBCONTROLS( Panel )
|
QSK_SUBCONTROLS( Panel )
|
||||||
|
|
||||||
BoxWithButtons( const QString& title, bool isBright, QQuickItem* parent = nullptr );
|
BoxWithButtons( const QString& title, const QString& value, bool isBright, QQuickItem* parent = nullptr );
|
||||||
|
|
||||||
QskAspect::Subcontrol effectiveSubcontrol(
|
QskAspect::Subcontrol effectiveSubcontrol(
|
||||||
QskAspect::Subcontrol subControl ) const override
|
QskAspect::Subcontrol subControl ) const override
|
||||||
|
@ -31,7 +31,7 @@ class IndoorTemperature : public BoxWithButtons
|
||||||
QSK_SUBCONTROLS( Panel )
|
QSK_SUBCONTROLS( Panel )
|
||||||
|
|
||||||
IndoorTemperature( QQuickItem* parent )
|
IndoorTemperature( QQuickItem* parent )
|
||||||
: BoxWithButtons( "Indoor Temperature", true, parent )
|
: BoxWithButtons( "Indoor Temperature", "+24", true, parent )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -42,7 +42,7 @@ class Humidity: public BoxWithButtons
|
||||||
QSK_SUBCONTROLS( Panel )
|
QSK_SUBCONTROLS( Panel )
|
||||||
|
|
||||||
Humidity( QQuickItem* parent )
|
Humidity( QQuickItem* parent )
|
||||||
: BoxWithButtons( "Humidity", false, parent )
|
: BoxWithButtons( "Humidity", "30%", false, parent )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue