diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-02-07 11:57:42 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-07 06:36:05 +0100 |
| commit | 51b7425329e0fa221c319e8d75595c19f664aedb (patch) | |
| tree | 48c2d03edc05da74296a25540f1b8df52389b7ee /src/quick/items/qquicktextedit_p.h | |
| parent | ce3dee765c858a0b573d468ef8fee6b838e576d1 (diff) | |
Add contentWidth and contentHeight properties to Text elements.
For Text and TextEdit this is a rename of paintedWidth and paintedHeight
both of which remain as synonyms of the content properties for
compatability. For TextInput this is a new property.
Task-number: QTBUG-23691
Task-number: QTBUG-15160
Change-Id: Idbdc72fad34922be21b649ca45fc39b5e533ed1a
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Diffstat (limited to 'src/quick/items/qquicktextedit_p.h')
| -rw-r--r-- | src/quick/items/qquicktextedit_p.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/quick/items/qquicktextedit_p.h b/src/quick/items/qquicktextedit_p.h index d74c489d38..d4aeaa5109 100644 --- a/src/quick/items/qquicktextedit_p.h +++ b/src/quick/items/qquicktextedit_p.h @@ -72,8 +72,10 @@ class Q_AUTOTEST_EXPORT QQuickTextEdit : public QQuickImplicitSizeItem Q_PROPERTY(WrapMode wrapMode READ wrapMode WRITE setWrapMode NOTIFY wrapModeChanged) Q_PROPERTY(int lineCount READ lineCount NOTIFY lineCountChanged) Q_PROPERTY(int length READ length NOTIFY textChanged) - Q_PROPERTY(qreal paintedWidth READ paintedWidth NOTIFY paintedSizeChanged) - Q_PROPERTY(qreal paintedHeight READ paintedHeight NOTIFY paintedSizeChanged) + Q_PROPERTY(qreal contentWidth READ contentWidth NOTIFY contentSizeChanged) + Q_PROPERTY(qreal contentHeight READ contentHeight NOTIFY contentSizeChanged) + Q_PROPERTY(qreal paintedWidth READ contentWidth NOTIFY contentSizeChanged) // Compatibility + Q_PROPERTY(qreal paintedHeight READ contentHeight NOTIFY contentSizeChanged) Q_PROPERTY(TextFormat textFormat READ textFormat WRITE setTextFormat NOTIFY textFormatChanged) Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly NOTIFY readOnlyChanged) Q_PROPERTY(bool cursorVisible READ isCursorVisible WRITE setCursorVisible NOTIFY cursorVisibleChanged) @@ -212,8 +214,8 @@ public: QVariant inputMethodQuery(Qt::InputMethodQuery property) const; - qreal paintedWidth() const; - qreal paintedHeight() const; + qreal contentWidth() const; + qreal contentHeight() const; QUrl baseUrl() const; void setBaseUrl(const QUrl &url); @@ -233,7 +235,7 @@ public: Q_SIGNALS: void textChanged(); - void paintedSizeChanged(); + void contentSizeChanged(); void cursorPositionChanged(); void cursorRectangleChanged(); void selectionStartChanged(); |