diff options
| -rw-r--r-- | src/declarative/fx/fx.pri | 4 | ||||
| -rw-r--r-- | src/declarative/fx/qfxgraphicsobjectcontainer.cpp (renamed from src/declarative/fx/qfxwidgetcontainer.cpp) | 47 | ||||
| -rw-r--r-- | src/declarative/fx/qfxgraphicsobjectcontainer.h (renamed from src/declarative/fx/qfxwidgetcontainer.h) | 28 |
3 files changed, 40 insertions, 39 deletions
diff --git a/src/declarative/fx/fx.pri b/src/declarative/fx/fx.pri index 413b8db..24c5536 100644 --- a/src/declarative/fx/fx.pri +++ b/src/declarative/fx/fx.pri @@ -40,7 +40,7 @@ HEADERS += \ fx/qfxpixmap.cpp \ fx/qfxvisualitemmodel.h \ fx/qfxlistview.h \ - fx/qfxwidgetcontainer.h \ + fx/qfxgraphicsobjectcontainer.h \ SOURCES += \ fx/qfxanchors.cpp \ @@ -69,7 +69,7 @@ SOURCES += \ fx/qfxpixmap.cpp \ fx/qfxvisualitemmodel.cpp \ fx/qfxlistview.cpp \ - fx/qfxwidgetcontainer.cpp \ + fx/qfxgraphicsobjectcontainer.cpp \ contains(QT_CONFIG, webkit) { QT+=webkit diff --git a/src/declarative/fx/qfxwidgetcontainer.cpp b/src/declarative/fx/qfxgraphicsobjectcontainer.cpp index ea702db..479a21d 100644 --- a/src/declarative/fx/qfxwidgetcontainer.cpp +++ b/src/declarative/fx/qfxgraphicsobjectcontainer.cpp @@ -39,59 +39,60 @@ ** ****************************************************************************/ -#include "qfxwidgetcontainer.h" -#include <qgraphicswidget.h> +#include "qfxgraphicsobjectcontainer.h" +#include <QGraphicsObject> QT_BEGIN_NAMESPACE /*! - \qmlclass WidgetContainer QFxWidgetContainer - \brief The WidgetContainer element allows you to add QGraphicsWidgets into Fluid UI elements. + \qmlclass GraphicsObjectContainer QFxGraphicsObjectContainer + \brief The GraphicsObjectContainer element allows you to add QGraphicsObjects into Fluid UI elements. */ /*! \internal - \class QFxWidgetContainer - \brief The QFxWidgetContainer class allows you to add QGraphicsWidgets into Fluid UI applications. + \class QFxGraphicsObjectContainer + \brief The QFxGraphicsObjectContainer class allows you to add QGraphicsObjects into Fluid UI applications. */ -QML_DEFINE_TYPE(QFxWidgetContainer, WidgetContainer) +QML_DEFINE_TYPE(QFxGraphicsObjectContainer, GraphicsObjectContainer) -QFxWidgetContainer::QFxWidgetContainer(QFxItem *parent) -: QFxItem(parent), _graphicsWidget(0) +QFxGraphicsObjectContainer::QFxGraphicsObjectContainer(QFxItem *parent) +: QFxItem(parent), _graphicsObject(0) { } -QFxWidgetContainer::~QFxWidgetContainer() +QFxGraphicsObjectContainer::~QFxGraphicsObjectContainer() { } -QGraphicsWidget *QFxWidgetContainer::graphicsWidget() const +QGraphicsObject *QFxGraphicsObjectContainer::graphicsObject() const { - return _graphicsWidget; + return _graphicsObject; } /*! - \qmlproperty QGraphicsWidget QFxWidgetContainer::graphicsWidget - The QGraphicsWidget associated with this element. + \qmlproperty QGraphicsObject GraphicsObjectContainer::graphicsObject + The QGraphicsObject associated with this element. */ -void QFxWidgetContainer::setGraphicsWidget(QGraphicsWidget *widget) +void QFxGraphicsObjectContainer::setGraphicsObject(QGraphicsObject *object) { - if (widget == _graphicsWidget) + if (object == _graphicsObject) return; - _graphicsWidget = widget; + _graphicsObject = object; - _graphicsWidget->setParentItem(this); + _graphicsObject->setParentItem(this); } -void QFxWidgetContainer::canvasChanged() +QVariant QFxGraphicsObjectContainer::itemChange(GraphicsItemChange change, const QVariant &value) { - if (_graphicsWidget) { - QGraphicsWidget *w = _graphicsWidget; - _graphicsWidget = 0; - setGraphicsWidget(w); + if (change == ItemSceneHasChanged) { + QGraphicsObject *o = _graphicsObject; + _graphicsObject = 0; + setGraphicsObject(o); } + return QFxItem::itemChange(change, value); } QT_END_NAMESPACE diff --git a/src/declarative/fx/qfxwidgetcontainer.h b/src/declarative/fx/qfxgraphicsobjectcontainer.h index 862a280..e118555 100644 --- a/src/declarative/fx/qfxwidgetcontainer.h +++ b/src/declarative/fx/qfxgraphicsobjectcontainer.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QFXWIDGETCONTAINER_H -#define QFXWIDGETCONTAINER_H +#ifndef QFXGRAPHICSOBJECTCONTAINER_H +#define QFXGRAPHICSOBJECTCONTAINER_H #include <QtDeclarative/qfxitem.h> @@ -50,33 +50,33 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -class QGraphicsWidget; +class QGraphicsObject; -class Q_DECLARATIVE_EXPORT QFxWidgetContainer : public QFxItem +class Q_DECLARATIVE_EXPORT QFxGraphicsObjectContainer : public QFxItem { Q_OBJECT - Q_CLASSINFO("DefaultProperty", "graphicsWidget") - Q_PROPERTY(QGraphicsWidget *graphicsWidget READ graphicsWidget WRITE setGraphicsWidget) + Q_CLASSINFO("DefaultProperty", "graphicsObject") + Q_PROPERTY(QGraphicsObject *graphicsObject READ graphicsObject WRITE setGraphicsObject) public: - QFxWidgetContainer(QFxItem *parent = 0); - ~QFxWidgetContainer(); + QFxGraphicsObjectContainer(QFxItem *parent = 0); + ~QFxGraphicsObjectContainer(); - QGraphicsWidget *graphicsWidget() const; - void setGraphicsWidget(QGraphicsWidget *); + QGraphicsObject *graphicsObject() const; + void setGraphicsObject(QGraphicsObject *); protected: - virtual void canvasChanged(); + QVariant itemChange(GraphicsItemChange change, const QVariant &value); private: - QGraphicsWidget *_graphicsWidget; + QGraphicsObject *_graphicsObject; }; QT_END_NAMESPACE -QML_DECLARE_TYPE(QFxWidgetContainer) +QML_DECLARE_TYPE(QFxGraphicsObjectContainer) QT_END_HEADER -#endif // QFXGRAPHICSWIDGET_H +#endif // QFXGRAPHICSOBJECTCONTAINER_H |