equal
deleted
inserted
replaced
70 Q_DECLARE_PUBLIC(QDeclarativeText) |
70 Q_DECLARE_PUBLIC(QDeclarativeText) |
71 public: |
71 public: |
72 QDeclarativeTextPrivate() |
72 QDeclarativeTextPrivate() |
73 : color((QRgb)0), style(QDeclarativeText::Normal), |
73 : color((QRgb)0), style(QDeclarativeText::Normal), |
74 hAlign(QDeclarativeText::AlignLeft), vAlign(QDeclarativeText::AlignTop), elideMode(QDeclarativeText::ElideNone), |
74 hAlign(QDeclarativeText::AlignLeft), vAlign(QDeclarativeText::AlignTop), elideMode(QDeclarativeText::ElideNone), |
75 imgDirty(true), dirty(true), richText(false), singleline(false), cache(true), doc(0), |
75 imgDirty(true), dirty(true), richText(false), singleline(false), cache(true), internalWidthUpdate(false), doc(0), |
76 format(QDeclarativeText::AutoText), wrapMode(QDeclarativeText::NoWrap) |
76 format(QDeclarativeText::AutoText), wrapMode(QDeclarativeText::NoWrap) |
77 { |
77 { |
78 #if defined(QML_NO_TEXT_CACHE) |
78 #if defined(QML_NO_TEXT_CACHE) |
79 cache = false; |
79 cache = false; |
80 #endif |
80 #endif |
117 bool imgDirty:1; |
117 bool imgDirty:1; |
118 bool dirty:1; |
118 bool dirty:1; |
119 bool richText:1; |
119 bool richText:1; |
120 bool singleline:1; |
120 bool singleline:1; |
121 bool cache:1; |
121 bool cache:1; |
|
122 bool internalWidthUpdate:1; |
122 QTextDocumentWithImageResources *doc; |
123 QTextDocumentWithImageResources *doc; |
123 QTextLayout layout; |
124 QTextLayout layout; |
124 QSize cachedLayoutSize; |
125 QSize cachedLayoutSize; |
125 QDeclarativeText::TextFormat format; |
126 QDeclarativeText::TextFormat format; |
126 QDeclarativeText::WrapMode wrapMode; |
127 QDeclarativeText::WrapMode wrapMode; |
|
128 |
|
129 static inline QDeclarativeTextPrivate *get(QDeclarativeText *t) { |
|
130 return t->d_func(); |
|
131 } |
127 }; |
132 }; |
128 |
133 |
129 QT_END_NAMESPACE |
134 QT_END_NAMESPACE |
130 #endif |
135 #endif |