Changeset 561 for trunk/src/gui/itemviews/qtreeview_p.h

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/itemviews/qtreeview_p.h (modified) (8 diffs)

trunk/src/gui/itemviews/qtreeview_p.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** 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.
+** 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
@@ -34 +34 @@
 ** 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.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -55 +55 @@
 
 #include "private/qabstractitemview_p.h"
+#include <QtCore/qvariantanimation.h>
 
 #ifndef QT_NO_TREEVIEW
@@ -62 +63 @@
 struct QTreeViewItem
 {
-    QTreeViewItem() : expanded(false), spanning(false), total(0), level(0), height(0) {}
+    QTreeViewItem() : expanded(false), spanning(false), hasChildren(false),
+                      hasMoreSiblings(false), total(0), level(0), height(0) {}
     QModelIndex index; // we remove items whenever the indexes are invalidated
     uint expanded : 1;
     uint spanning : 1;
-    uint total : 30; // total number of children visible
+    uint hasChildren : 1; // if the item has visible children (even if collapsed)
+    uint hasMoreSiblings : 1;
+    uint total : 28; // total number of children visible
     uint level : 16; // indentation
     int height : 16; // row height
@@ -82 +86 @@
           itemsExpandable(true), sortingEnabled(false),
           expandsOnDoubleClick(true),
-          allColumnsShowFocus(false),
+          allColumnsShowFocus(false), current(0), spanning(false),
           animationsEnabled(false), columnResizeTimerID(0),
           autoExpandDelay(-1), hoverBranch(-1), geometryRecursionBlock(false) {}
@@ -89 +93 @@
     void initialize();
 
-    struct AnimatedOperation
+    QItemViewPaintPairs draggablePaintPairs(const QModelIndexList &indexes, QRect *r) const;
+
+#ifndef QT_NO_ANIMATION
+    struct AnimatedOperation : public QVariantAnimation
     {
-        enum Type { Expand, Collapse };
         int item;
-        int top;
-        int duration;
-        Type type;
         QPixmap before;
         QPixmap after;
-    };
+        QWidget *viewport;
+        AnimatedOperation() : item(0) { setEasingCurve(QEasingCurve::InOutQuad); }
+        int top() const { return startValue().toInt(); }
+        QRect rect() const { QRect rect = viewport->rect(); rect.moveTop(top()); return rect; }
+        void updateCurrentValue(const QVariant &) { viewport->update(rect()); }
+        void updateState(State state, State) { if (state == Stopped) before = after = QPixmap(); }
+    } animatedOperation;
+    void prepareAnimatedOperation(int item, QVariantAnimation::Direction d);
+    void beginAnimatedOperation();
+    void drawAnimatedOperation(QPainter *painter) const;
+    QPixmap renderTreeToPixmapForAnimation(const QRect &rect) const;
+    void _q_endAnimatedOperation();
+#endif //QT_NO_ANIMATION
 
     void expand(int item, bool emitSignal);
     void collapse(int item, bool emitSignal);
 
-    void prepareAnimatedOperation(int item, AnimatedOperation::Type type);
-    void beginAnimatedOperation();
-    void _q_endAnimatedOperation();
-    void drawAnimatedOperation(QPainter *painter) const;
-    QPixmap renderTreeToPixmapForAnimation(const QRect &rect) const;
-
-    inline QRect animationRect() const
-        { return QRect(0, animatedOperation.top, viewport->width(),
-                       viewport->height() - animatedOperation.top); }
-
-    void _q_currentChanged(const QModelIndex&, const QModelIndex&);
     void _q_columnsAboutToBeRemoved(const QModelIndex &, int, int);
     void _q_columnsRemoved(const QModelIndex &, int, int);
     void _q_modelAboutToBeReset();
-    void _q_animate();
     void _q_sortIndicatorChanged(int column, Qt::SortOrder order);
     void _q_modelDestroyed();
@@ -178 +181 @@
     // used when expanding and collapsing items
     QSet<QPersistentModelIndex> expandedIndexes;
-    QStack<bool> expandParent;
-    AnimatedOperation animatedOperation;
     bool animationsEnabled;