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

fix build with new QSkinny version

This commit is contained in:
Peter Hartmann 2020-12-17 09:28:54 +01:00
parent a76240b41b
commit dc41583279
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/iot-dashboard/Box.cpp
View File

@ -45,7 +45,7 @@ Box::Box( const QString& title, QQuickItem* parent )
setAutoLayoutChildren( true );
setBackgroundColor( Qt::white );
setMarginsHint( Panel | QskAspect::Padding, 15 );
setMarginHint( Panel | QskAspect::Padding, 15 );
setPanel( true );
setBoxShapeHint( QskBox::Panel, 6 );
// setBoxBorderMetricsHint( QskBox::Panel, 2 );

2
examples/iot-dashboard/Diagram.cpp
View File

@ -132,7 +132,7 @@ Diagram::Diagram( QQuickItem* parent )
, m_weekdays( new QskGridBox( this ) )
, m_content( new DiagramContent( this ) )
{
setMarginsHint( Panel | QskAspect::Padding, 0 );
setMarginHint( Panel | QskAspect::Padding, 0 );
setAutoAddChildren( false );
setAutoLayoutChildren( true );

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

@ -15,7 +15,7 @@ Humidity::Humidity( QQuickItem* parent )
: Box( "", parent )
{
setPanel( true );
setMarginsHint( Panel | QskAspect::Padding, 8 );
setMarginHint( Panel | QskAspect::Padding, 8 );
setSizePolicy( Qt::Vertical, QskSizePolicy::Maximum );
auto* layout = new QskLinearBox( Qt::Horizontal, this );

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

@ -15,7 +15,7 @@ IndoorTemperature::IndoorTemperature( QQuickItem* parent )
: Box( "", parent )
{
setPanel( true );
setMarginsHint( Panel | QskAspect::Padding, 8 );
setMarginHint( Panel | QskAspect::Padding, 8 );
setSizePolicy( Qt::Vertical, QskSizePolicy::Maximum );
auto* layout = new QskLinearBox( Qt::Horizontal, this );
@ -37,4 +37,5 @@ IndoorTemperature::IndoorTemperature( QQuickItem* parent )
value->setTextColor( "#929CB2" );
auto* buttons = new UpAndDownButton( layout );
Q_UNUSED( buttons );
}

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

@ -30,9 +30,9 @@ ShadowPositioner::ShadowPositioner( QQuickItem* parent ) : QskControl( parent )
void ShadowPositioner::setGridBox( QskGridBox* gridBox )
{
m_gridBox = gridBox;
m_rectangles.reserve( m_gridBox->count() );
m_rectangles.reserve( m_gridBox->elementCount() );
for( int i = 0; i < m_gridBox->count(); ++i )
for( int i = 0; i < m_gridBox->elementCount(); ++i )
{
auto* r = new ShadowedRectangle( this );
r->setZ( 5 );
@ -115,8 +115,8 @@ QskAspect::Subcontrol MainContent::effectiveSubcontrol( QskAspect::Subcontrol su
return subControl;
}
void MainContent::geometryChanged( const QRectF& newGeometry, const QRectF& oldGeometry )
void MainContent::geometryChangeEvent( QskGeometryChangeEvent* event )
{
QskLinearBox::geometryChanged( newGeometry, oldGeometry );
QskLinearBox::geometryChangeEvent( event );
m_shadowPositioner->polish();
}

2
examples/iot-dashboard/MainContent.h
View File

@ -34,7 +34,7 @@ class MainContent : public QskLinearBox
QskAspect::Subcontrol subControl ) const override final;
protected:
void geometryChanged( const QRectF&, const QRectF& ) override;
void geometryChangeEvent( QskGeometryChangeEvent* ) override;
private:
QList< QskLinearBox* > m_columns;