diff options
author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2017-08-01 12:34:29 +0200 |
---|---|---|
committer | Jędrzej Nowacki <jedrzej.nowacki@qt.io> | 2017-08-06 08:16:06 +0000 |
commit | 9342a8b843e2fe924db09b2935464ac6d26adc27 (patch) | |
tree | cca3185653b41c9043b73b38c33b160910c2aef3 /src/widgets/widgets/qtextedit.h | |
parent | b03706d35f556fbaa91d4e05ee7a337220e174b8 (diff) |
Add QTextOption/QTextEdit/QPlainTextEdit::tabStopDistance property
In Qt, we have QTextOption::tabStop, QTextEdit::tabStopWidth and
QPlainTextEdit::tabStopWidth.
Neither are very good names, since the tab stop is neither a
numerical value as in the former, nor does it have any dimensions
that can be measured, as in the latter. Vertical text advances
may also be supported by Qt at some point in the future, at
which point the name would make even less sense.
At the same time, we expose the actual type of the tab stop
distance as floating point in the QTextEdit and QPlainTextEdit
API instead of always rounding it to an int.
To avoid duplicating either of these APIs in Qt Quick, we
introduce tabStopDistance as the common term instead and deprecate
the old names.
[ChangeLog][Text] Introduced tabStopDistance property in
QTextOption, QTextEdit and QPlainTextEdit as replacement for
the inconsistently named tabStop and tabStopWidth properties.
QTextOption::tabStop, QTextEdit::tabStopWidth and
QPlainTextEdit::tabStopWidth have subsequently been deprecated.
Change-Id: Ib7e01387910cddb58adaaaadcd56c0e69edc4bc2
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/widgets/widgets/qtextedit.h')
-rw-r--r-- | src/widgets/widgets/qtextedit.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/widgets/widgets/qtextedit.h b/src/widgets/widgets/qtextedit.h index 745b644511..a3e5bd2a8a 100644 --- a/src/widgets/widgets/qtextedit.h +++ b/src/widgets/widgets/qtextedit.h @@ -77,7 +77,10 @@ class Q_WIDGETS_EXPORT QTextEdit : public QAbstractScrollArea #endif Q_PROPERTY(QString plainText READ toPlainText WRITE setPlainText DESIGNABLE false) Q_PROPERTY(bool overwriteMode READ overwriteMode WRITE setOverwriteMode) +#if QT_DEPRECATED_SINCE(5, 10) Q_PROPERTY(int tabStopWidth READ tabStopWidth WRITE setTabStopWidth) +#endif + Q_PROPERTY(qreal tabStopDistance READ tabStopDistance WRITE setTabStopDistance) Q_PROPERTY(bool acceptRichText READ acceptRichText WRITE setAcceptRichText) Q_PROPERTY(int cursorWidth READ cursorWidth WRITE setCursorWidth) Q_PROPERTY(Qt::TextInteractionFlags textInteractionFlags READ textInteractionFlags WRITE setTextInteractionFlags) @@ -187,8 +190,13 @@ public: bool overwriteMode() const; void setOverwriteMode(bool overwrite); - int tabStopWidth() const; - void setTabStopWidth(int width); +#if QT_DEPRECATED_SINCE(5, 10) + QT_DEPRECATED int tabStopWidth() const; + QT_DEPRECATED void setTabStopWidth(int width); +#endif + + qreal tabStopDistance() const; + void setTabStopDistance(qreal distance); int cursorWidth() const; void setCursorWidth(int width); |