WidgetContainer renamed to GraphicsObjectContainer.

Also corrected handling of scene change.

1 files changed, 98 insertions, 0 deletions

diff --git a/src/declarative/fx/qfxgraphicsobjectcontainer.cpp b/src/declarative/fx/qfxgraphicsobjectcontainer.cpp
new file mode 100644
index 0000000..479a21d
--- /dev/null
+++ b/src/declarative/fx/qfxgraphicsobjectcontainer.cpp
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qfxgraphicsobjectcontainer.h"
+#include <QGraphicsObject>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \qmlclass GraphicsObjectContainer QFxGraphicsObjectContainer
+    \brief The GraphicsObjectContainer element allows you to add QGraphicsObjects into Fluid UI elements.
+*/
+
+/*!
+    \internal
+    \class QFxGraphicsObjectContainer
+    \brief The QFxGraphicsObjectContainer class allows you to add QGraphicsObjects into Fluid UI applications.
+*/
+
+QML_DEFINE_TYPE(QFxGraphicsObjectContainer, GraphicsObjectContainer)
+
+QFxGraphicsObjectContainer::QFxGraphicsObjectContainer(QFxItem *parent)
+: QFxItem(parent), _graphicsObject(0)
+{
+}
+
+QFxGraphicsObjectContainer::~QFxGraphicsObjectContainer()
+{
+}
+
+QGraphicsObject *QFxGraphicsObjectContainer::graphicsObject() const
+{
+    return _graphicsObject;
+}
+
+/*!
+    \qmlproperty QGraphicsObject GraphicsObjectContainer::graphicsObject
+    The QGraphicsObject associated with this element.
+*/
+void QFxGraphicsObjectContainer::setGraphicsObject(QGraphicsObject *object)
+{
+    if (object == _graphicsObject)
+        return;
+
+    _graphicsObject = object;
+
+    _graphicsObject->setParentItem(this);
+}
+
+QVariant QFxGraphicsObjectContainer::itemChange(GraphicsItemChange change, const QVariant &value)
+{
+    if (change == ItemSceneHasChanged) {
+        QGraphicsObject *o = _graphicsObject;
+        _graphicsObject = 0;
+        setGraphicsObject(o);
+    }
+    return QFxItem::itemChange(change, value);
+}
+
+QT_END_NAMESPACE