diff --git a/examples/iot-dashboard/MainContent.cpp b/examples/iot-dashboard/MainContent.cpp index 76a1753d..125d971b 100644 --- a/examples/iot-dashboard/MainContent.cpp +++ b/examples/iot-dashboard/MainContent.cpp @@ -48,6 +48,7 @@ #include #include #include +#include #include "kirigami/shadowedrectangle.h" @@ -101,7 +102,7 @@ void ShadowPositioner::updateLayout() for( int i = 0; i < m_rectangles.count(); ++i ) { auto* item = m_gridBox->itemAtIndex( i ); - m_rectangles[i]->setSize( item->size() ); + m_rectangles[i]->setSize( qskItemSize( item ) ); m_rectangles[i]->setPosition( mainContent->itemAtIndex( 1 )->position() + item->position() ); } } ); diff --git a/examples/iot-dashboard/MenuBar.cpp b/examples/iot-dashboard/MenuBar.cpp index 41694e84..7801a0bd 100644 --- a/examples/iot-dashboard/MenuBar.cpp +++ b/examples/iot-dashboard/MenuBar.cpp @@ -95,7 +95,7 @@ MenuBar::MenuBar( QQuickItem* parent ) : QskLinearBox( Qt::Vertical, parent ) m_entryStrings = { "Dashboard", "Rooms", "Devices", "Statistics", "Storage", "Members" }; - for( const auto& entryString : qAsConst( m_entryStrings ) ) + for( const auto& entryString : qskAsConst( m_entryStrings ) ) { auto* entry = new MenuItem( entryString, this ); m_entries.append( entry ); diff --git a/examples/iot-dashboard/iot-dashboard.pro b/examples/iot-dashboard/iot-dashboard.pro index c0864006..575a1d76 100644 --- a/examples/iot-dashboard/iot-dashboard.pro +++ b/examples/iot-dashboard/iot-dashboard.pro @@ -52,18 +52,18 @@ HEADERS += \ nodes/DiagramSegmentsNode.h HEADERS += \ -kirigami/shadowedrectangle.h \ -kirigami/scenegraph/paintedrectangleitem.h \ -kirigami/scenegraph/shadowedborderrectanglematerial.h \ -kirigami/scenegraph/shadowedrectanglematerial.h \ -kirigami/scenegraph/shadowedrectanglenode.h + kirigami/shadowedrectangle.h \ + kirigami/scenegraph/paintedrectangleitem.h \ + kirigami/scenegraph/shadowedborderrectanglematerial.h \ + kirigami/scenegraph/shadowedrectanglematerial.h \ + kirigami/scenegraph/shadowedrectanglenode.h SOURCES += \ -kirigami/shadowedrectangle.cpp \ -kirigami/scenegraph/paintedrectangleitem.cpp \ -kirigami/scenegraph/shadowedborderrectanglematerial.cpp \ -kirigami/scenegraph/shadowedrectanglematerial.cpp \ -kirigami/scenegraph/shadowedrectanglenode.cpp + kirigami/shadowedrectangle.cpp \ + kirigami/scenegraph/paintedrectangleitem.cpp \ + kirigami/scenegraph/shadowedborderrectanglematerial.cpp \ + kirigami/scenegraph/shadowedrectanglematerial.cpp \ + kirigami/scenegraph/shadowedrectanglenode.cpp RESOURCES += \ images.qrc \ diff --git a/examples/iot-dashboard/kirigami/scenegraph/shadowedborderrectanglematerial.cpp b/examples/iot-dashboard/kirigami/scenegraph/shadowedborderrectanglematerial.cpp index cb5e4507..25bfcd06 100644 --- a/examples/iot-dashboard/kirigami/scenegraph/shadowedborderrectanglematerial.cpp +++ b/examples/iot-dashboard/kirigami/scenegraph/shadowedborderrectanglematerial.cpp @@ -59,7 +59,7 @@ void ShadowedBorderRectangleShader::updateState(const QSGMaterialShader::RenderS auto p = program(); - if (!oldMaterial || newMaterial->compare(oldMaterial) != 0 || state.isCachedMaterialDataDirty()) { + if (!oldMaterial || newMaterial->compare(oldMaterial) != 0 ) { auto material = static_cast(newMaterial); p->setUniformValue(m_borderWidthLocation, material->borderWidth); p->setUniformValue(m_borderColorLocation, material->borderColor); diff --git a/examples/iot-dashboard/kirigami/scenegraph/shadowedrectanglematerial.cpp b/examples/iot-dashboard/kirigami/scenegraph/shadowedrectanglematerial.cpp index 12b293b6..42f31b7b 100644 --- a/examples/iot-dashboard/kirigami/scenegraph/shadowedrectanglematerial.cpp +++ b/examples/iot-dashboard/kirigami/scenegraph/shadowedrectanglematerial.cpp @@ -77,7 +77,7 @@ void ShadowedRectangleShader::updateState(const QSGMaterialShader::RenderState& p->setUniformValue(m_opacityLocation, state.opacity()); } - if (!oldMaterial || newMaterial->compare(oldMaterial) != 0 || state.isCachedMaterialDataDirty()) { + if (!oldMaterial || newMaterial->compare(oldMaterial) != 0 ) { auto material = static_cast(newMaterial); p->setUniformValue(m_aspectLocation, material->aspect); p->setUniformValue(m_sizeLocation, material->size); diff --git a/examples/iot-dashboard/kirigami/shadowedrectangle.cpp b/examples/iot-dashboard/kirigami/shadowedrectangle.cpp index 58d57343..e2136c4a 100644 --- a/examples/iot-dashboard/kirigami/shadowedrectangle.cpp +++ b/examples/iot-dashboard/kirigami/shadowedrectangle.cpp @@ -7,8 +7,6 @@ #include "shadowedrectangle.h" #include -#include -#include #include "scenegraph/shadowedrectanglenode.h" #include "scenegraph/paintedrectangleitem.h" @@ -284,7 +282,7 @@ void ShadowedRectangle::componentComplete() bool ShadowedRectangle::isSoftwareRendering() const { - return window() && window()->rendererInterface()->graphicsApi() == QSGRendererInterface::Software; + return false; } PaintedRectangleItem* ShadowedRectangle::softwareItem() const