Changeset 846 for trunk/src/gui/graphicsview/qgraphicsview_p.h
- Timestamp:
- May 5, 2011, 5:36:53 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.7.2 (added) merged: 845 /branches/vendor/nokia/qt/current merged: 844 /branches/vendor/nokia/qt/4.6.3 removed
- Property svn:mergeinfo changed
-
trunk/src/gui/graphicsview/qgraphicsview_p.h
r769 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) … … 66 66 QT_BEGIN_NAMESPACE 67 67 68 class Q_ AUTOTEST_EXPORT QGraphicsViewPrivate : public QAbstractScrollAreaPrivate68 class Q_GUI_EXPORT QGraphicsViewPrivate : public QAbstractScrollAreaPrivate 69 69 { 70 70 Q_DECLARE_PUBLIC(QGraphicsView) … … 78 78 79 79 QGraphicsView::DragMode dragMode; 80 bool sceneInteractionAllowed; 80 81 quint32 sceneInteractionAllowed : 1; 82 quint32 hasSceneRect : 1; 83 quint32 connectedToScene : 1; 84 quint32 useLastMouseEvent : 1; 85 quint32 identityMatrix : 1; 86 quint32 dirtyScroll : 1; 87 quint32 accelerateScrolling : 1; 88 quint32 keepLastCenterPoint : 1; 89 quint32 transforming : 1; 90 quint32 handScrolling : 1; 91 quint32 mustAllocateStyleOptions : 1; 92 quint32 mustResizeBackgroundPixmap : 1; 93 quint32 fullUpdatePending : 1; 94 quint32 hasUpdateClip : 1; 95 quint32 padding : 18; 96 81 97 QRectF sceneRect; 82 bool hasSceneRect;83 98 void updateLastCenterPoint(); 84 bool connectedToScene;85 99 86 100 qint64 horizontalScroll() const; … … 90 104 QRectF mapRectFromScene(const QRectF &rect) const; 91 105 106 QRect updateClip; 92 107 QPointF mousePressItemPoint; 93 108 QPointF mousePressScenePoint; … … 99 114 Qt::MouseButton mousePressButton; 100 115 QTransform matrix; 101 bool identityMatrix;102 116 qint64 scrollX, scrollY; 103 bool dirtyScroll;104 117 void updateScroll(); 105 118 106 bool accelerateScrolling;107 119 qreal leftIndent; 108 120 qreal topIndent; … … 110 122 // Replaying mouse events 111 123 QMouseEvent lastMouseEvent; 112 bool useLastMouseEvent;113 124 void replayLastMouseEvent(); 114 125 void storeMouseEvent(QMouseEvent *event); … … 116 127 117 128 QPointF lastCenterPoint; 118 bool keepLastCenterPoint;119 129 Qt::Alignment alignment; 120 bool transforming;121 130 122 131 QGraphicsView::ViewportAnchor transformationAnchor; … … 132 141 Qt::ItemSelectionMode rubberBandSelectionMode; 133 142 #endif 134 bool handScrolling;135 143 int handScrollMotions; 136 144 … … 138 146 139 147 QVector<QStyleOptionGraphicsItem> styleOptions; 140 bool mustAllocateStyleOptions;141 148 QStyleOptionGraphicsItem *allocStyleOptionsArray(int numItems); 142 149 void freeStyleOptionsArray(QStyleOptionGraphicsItem *array); … … 145 152 QBrush foregroundBrush; 146 153 QPixmap backgroundPixmap; 147 bool mustResizeBackgroundPixmap;148 154 QRegion backgroundPixmapExposed; 149 155 … … 162 168 QRect mapToViewRect(const QGraphicsItem *item, const QRectF &rect) const; 163 169 QRegion mapToViewRegion(const QGraphicsItem *item, const QRectF &rect) const; 164 bool fullUpdatePending;165 170 QRegion dirtyRegion; 166 171 QRect dirtyBoundingRect; … … 193 198 } 194 199 200 void setUpdateClip(QGraphicsItem *); 201 202 inline bool updateRectF(const QRectF &rect) 203 { 204 if (rect.isEmpty()) 205 return false; 206 if (optimizationFlags & QGraphicsView::DontAdjustForAntialiasing) 207 return updateRect(rect.toAlignedRect().adjusted(-1, -1, 1, 1)); 208 return updateRect(rect.toAlignedRect().adjusted(-2, -2, 2, 2)); 209 } 210 195 211 bool updateRect(const QRect &rect); 196 bool updateRegion(const QRe gion ®ion);212 bool updateRegion(const QRectF &rect, const QTransform &xform); 197 213 bool updateSceneSlotReimplementedChecked; 198 214 QRegion exposedRegion;
Note:
See TracChangeset
for help on using the changeset viewer.