From a129444bb0156c936900dbd2f12bd9f427ff366c Mon Sep 17 00:00:00 2001 From: Qt by Nokia Date: Wed, 27 Apr 2011 14:13:26 +0200 Subject: Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469 --- src/declarative/items/qsgpainteditem_p.h | 67 ++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 src/declarative/items/qsgpainteditem_p.h (limited to 'src/declarative/items/qsgpainteditem_p.h') diff --git a/src/declarative/items/qsgpainteditem_p.h b/src/declarative/items/qsgpainteditem_p.h new file mode 100644 index 0000000000..c49da5098f --- /dev/null +++ b/src/declarative/items/qsgpainteditem_p.h @@ -0,0 +1,67 @@ +// Commit: ac5c099cc3c5b8c7eec7a49fdeb8a21037230350 +/**************************************************************************** +** +** Copyright (C) 2011 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$ +** 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 Technology Preview License Agreement accompanying +** this package. +** +** 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.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QSGPAINTEDITEM_P_P_H +#define QSGPAINTEDITEM_P_P_H + +#include "qsgitem_p.h" + +QT_BEGIN_NAMESPACE + +class QSGPaintedItemPrivate : public QSGItemPrivate +{ +public: + QSGPaintedItemPrivate(); + + QColor fillColor; + QSGPaintedItem::RenderTarget renderTarget; + + QRect dirtyRect; + + bool geometryDirty : 1; + bool contentsDirty : 1; + bool opaquePainting: 1; +}; + +QT_END_NAMESPACE + +#endif // QSGPAINTEDITEM_P_P_H -- cgit v1.2.3 From 9267a7bce715924a96c8636a3110d90879e5927c Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Tue, 3 May 2011 14:41:52 +0200 Subject: Added antialiasing property to QSGPaintedItem. --- src/declarative/items/qsgpainteditem_p.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/declarative/items/qsgpainteditem_p.h') diff --git a/src/declarative/items/qsgpainteditem_p.h b/src/declarative/items/qsgpainteditem_p.h index c49da5098f..ee76319a92 100644 --- a/src/declarative/items/qsgpainteditem_p.h +++ b/src/declarative/items/qsgpainteditem_p.h @@ -60,6 +60,7 @@ public: bool geometryDirty : 1; bool contentsDirty : 1; bool opaquePainting: 1; + bool antialiasing: 1; }; QT_END_NAMESPACE -- cgit v1.2.3 From 8883e0500eb7dee2439fce884acfd2177e07811a Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Thu, 5 May 2011 15:41:36 +0200 Subject: Implemented contentsSize and contentsScale for QSGPaintedItem. --- src/declarative/items/qsgpainteditem_p.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/declarative/items/qsgpainteditem_p.h') diff --git a/src/declarative/items/qsgpainteditem_p.h b/src/declarative/items/qsgpainteditem_p.h index ee76319a92..ac3e09e73b 100644 --- a/src/declarative/items/qsgpainteditem_p.h +++ b/src/declarative/items/qsgpainteditem_p.h @@ -52,6 +52,8 @@ class QSGPaintedItemPrivate : public QSGItemPrivate public: QSGPaintedItemPrivate(); + QSize contentsSize; + qreal contentsScale; QColor fillColor; QSGPaintedItem::RenderTarget renderTarget; -- cgit v1.2.3 From b909a2433e8bc4815d2f382ac23bb92ba1176b97 Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Tue, 10 May 2011 12:11:24 +0200 Subject: Added a separate property to enable mipmapping on QSGPaintedItem. Don't use QSGItem's smooth property for that anymore. --- src/declarative/items/qsgpainteditem_p.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/declarative/items/qsgpainteditem_p.h') diff --git a/src/declarative/items/qsgpainteditem_p.h b/src/declarative/items/qsgpainteditem_p.h index ac3e09e73b..9a170d0167 100644 --- a/src/declarative/items/qsgpainteditem_p.h +++ b/src/declarative/items/qsgpainteditem_p.h @@ -63,6 +63,7 @@ public: bool contentsDirty : 1; bool opaquePainting: 1; bool antialiasing: 1; + bool mipmap: 1; }; QT_END_NAMESPACE -- cgit v1.2.3