From 6c8378eaf1edbbefe6aaa3672b0127816a004fd7 Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Wed, 23 Nov 2011 15:14:07 +0100 Subject: Say hello to QtQuick module This change moves the QtQuick 2 types and C++ API (including SceneGraph) to a new module (AKA library), QtQuick. 99% of this change is moving files from src/declarative to src/quick, and from tests/auto/declarative to tests/auto/qtquick2. The loading of QtQuick 2 ("import QtQuick 2.0") is now delegated to a plugin, src/imports/qtquick2, just like it's done for QtQuick 1. All tools, examples, and tests that use QtQuick C++ API have gotten "QT += quick" or "QT += quick-private" added to their .pro file. A few additional internal QtDeclarative classes had to be exported (via Q_DECLARATIVE_PRIVATE_EXPORT) since they're needed by the QtQuick 2 implementation. The old header locations (e.g. QtDeclarative/qquickitem.h) will still be supported for some time, but will produce compile-time warnings. (To avoid the QtQuick implementation using the compatibility headers (since QtDeclarative's includepath comes first), a few include statements were modified, e.g. from "#include " to "#include ".) There's a change in qtbase that automatically adds QtQuick to the module list if QtDeclarative is used. Together with the compatibility headers, this should help reduce the migration pain for existing projects. In theory, simply getting an existing QtDeclarative-based project to compile and link shouldn't require any changes for now -- but porting to the new scheme is of course recommended, and will eventually become mandatory. Task-number: QTBUG-22889 Reviewed-by: Lars Knoll Change-Id: Ia52be9373172ba2f37e7623231ecb060316c96a7 Reviewed-by: Kent Hansen Reviewed-by: Sergio Ahumada --- src/quick/scenegraph/qsgdistancefieldglyphnode_p.h | 105 +++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 src/quick/scenegraph/qsgdistancefieldglyphnode_p.h (limited to 'src/quick/scenegraph/qsgdistancefieldglyphnode_p.h') diff --git a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.h b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.h new file mode 100644 index 0000000000..8096d4ae70 --- /dev/null +++ b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.h @@ -0,0 +1,105 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** 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.1, 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. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DISTANCEFIELD_GLYPHNODE_H +#define DISTANCEFIELD_GLYPHNODE_H + +#include +#include + +#include + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +class QSGDistanceFieldGlyphCacheManager; +class QSGDistanceFieldTextMaterial; +class QSGDistanceFieldGlyphNode: public QSGGlyphNode +{ +public: + QSGDistanceFieldGlyphNode(QSGDistanceFieldGlyphCacheManager *cacheManager); + ~QSGDistanceFieldGlyphNode(); + + virtual QPointF baseLine() const { return m_baseLine; } + virtual void setGlyphs(const QPointF &position, const QGlyphRun &glyphs); + virtual void setColor(const QColor &color); + + virtual void setPreferredAntialiasingMode(AntialiasingMode mode); + + virtual void setStyle(QQuickText::TextStyle style); + virtual void setStyleColor(const QColor &color); + + virtual void update(); + + void updateGeometry(); + +private: + void updateMaterial(); + + QColor m_color; + QPointF m_baseLine; + QSGDistanceFieldTextMaterial *m_material; + QPointF m_position; + QGlyphRun m_glyphs; + QSGDistanceFieldGlyphCacheManager *m_glyph_cacheManager; + QSGDistanceFieldGlyphCache *m_glyph_cache; + QSGGeometry m_geometry; + QQuickText::TextStyle m_style; + QColor m_styleColor; + AntialiasingMode m_antialiasingMode; + QRectF m_boundingRect; + + struct GlyphInfo { + quint32 glyphIndex; + QPointF position; + }; + QLinkedList m_glyphsToAdd; + + uint m_dirtyGeometry: 1; + uint m_dirtyMaterial: 1; +}; + +QT_END_HEADER + +QT_END_NAMESPACE + +#endif // DISTANCEFIELD_GLYPHNODE_H -- cgit v1.2.3