diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-10-24 21:04:43 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-10-25 13:03:27 +0000 |
| commit | 459842c6d880c1a754829b258d4ca4d1a136cdb9 (patch) | |
| tree | e4d218ea1df436a5a7791efbb28d9c8afd1a171e /src/quicktemplates2/qquickspinbox_p.h | |
| parent | 90659c9bed2464d87602c3d25eed2db2c4004b9a (diff) | |
Add QQuickSpinBox::displayText
Allows styles to create a simple binding to display the textual value
instead of calling the textFromValue() JS-function. Furthermore, this
allows us to do the text<->value conversion in C++ using QLocale by
default, unless custom textFromValue and/or valueFromText JS-functions
are provided.
Before:
running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_spinbox.qml
100 frames
100 frames
99 frames
Average: 99.6667 frames; using samples; MedianAll=100; StdDev=0.57735, CoV=0.00579281
After:
running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_spinbox.qml
152 frames
150 frames
151 frames
Average: 151 frames; using samples; MedianAll=151; StdDev=1, CoV=0.00662252
Change-Id: I66a5ebaf685d2c30613b58099724e6e7bbe00504
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickspinbox_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickspinbox_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickspinbox_p.h b/src/quicktemplates2/qquickspinbox_p.h index 13ba89a9..164a5f04 100644 --- a/src/quicktemplates2/qquickspinbox_p.h +++ b/src/quicktemplates2/qquickspinbox_p.h @@ -74,6 +74,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSpinBox : public QQuickControl Q_PROPERTY(Qt::InputMethodHints inputMethodHints READ inputMethodHints WRITE setInputMethodHints NOTIFY inputMethodHintsChanged FINAL REVISION 2) Q_PROPERTY(bool inputMethodComposing READ isInputMethodComposing NOTIFY inputMethodComposingChanged FINAL REVISION 2) Q_PROPERTY(bool wrap READ wrap WRITE setWrap NOTIFY wrapChanged FINAL REVISION 3) + Q_PROPERTY(QString displayText READ displayText NOTIFY displayTextChanged FINAL REVISION 4) public: explicit QQuickSpinBox(QQuickItem *parent = nullptr); @@ -113,6 +114,8 @@ public: bool wrap() const; void setWrap(bool wrap); + QString displayText() const; + public Q_SLOTS: void increase(); void decrease(); @@ -130,6 +133,7 @@ Q_SIGNALS: Q_REVISION(2) void inputMethodHintsChanged(); Q_REVISION(2) void inputMethodComposingChanged(); Q_REVISION(3) void wrapChanged(); + Q_REVISION(4) void displayTextChanged(); protected: void focusInEvent(QFocusEvent *event) override; @@ -146,6 +150,7 @@ protected: void componentComplete() override; void itemChange(ItemChange change, const ItemChangeData &value) override; void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override; + void localeChange(const QLocale &newLocale, const QLocale &oldLocale) override; QFont defaultFont() const override; QPalette defaultPalette() const override; |