diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-10-05 15:47:06 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-10-08 00:45:18 +0200 |
commit | e0b6b27d397faac924751be8da2c781286c3f8d7 (patch) | |
tree | cb35796de0d7e15b20919b6d5f228e5fdca78d7a /tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp | |
parent | e4a09b0194f5be39dfb445bbc5722410ed7bd9dc (diff) |
Add style hint for preventing spin box selection on up/down
On a mobile device, selecting text in a line edit brings up the text
action popup for select/copy/cut. In a spinbox where the user changes the
value using the buttons, this can be very irritating, without providing
any usability - the user is unlikely to start typing, at least not
without first transferring focus into the lineedit first to bring up the
keyboard.
This style hint allows styles to override the default behavior of
QAbstractSpinBox. Implement the customization for the Android style, and
add a test case for QSpinBox.
[ChangeLog][QtWidgets][QStyle] A new style hint, SH_SpinBox_SelectOnStep,
specifies whether pressing the up/down buttons or keys in a spinbox will
automatically select the text.
Fixes: QTBUG-93366
Change-Id: If06365a7c62087a2213145e13119f56544ac33b5
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp')
-rw-r--r-- | tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp index c877454440..fc3412f387 100644 --- a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp +++ b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp @@ -130,6 +130,28 @@ public: Qt::KeyboardModifier stepModifier = Qt::ControlModifier; }; +class SelectAllOnStepStyle : public QProxyStyle +{ +public: + SelectAllOnStepStyle(bool selectAll) + : selectAll(selectAll) + {} + + int styleHint(QStyle::StyleHint hint, const QStyleOption *option, + const QWidget *widget, QStyleHintReturn *returnData = nullptr) const override + { + switch (hint) { + case QStyle::SH_SpinBox_SelectOnStep: + return selectAll; + default: + return QProxyStyle::styleHint(hint, option, widget, returnData); + } + } + +private: + const bool selectAll; +}; + class tst_QSpinBox : public QObject { Q_OBJECT @@ -210,6 +232,10 @@ private slots: void stepModifierPressAndHold_data(); void stepModifierPressAndHold(); + + void stepSelectAll_data(); + void stepSelectAll(); + public slots: void textChangedHelper(const QString &); void valueChangedHelper(int); @@ -1855,5 +1881,42 @@ void tst_QSpinBox::stepModifierPressAndHold() QCOMPARE(value.toInt(), spy.length() * expectedStepModifier); } +void tst_QSpinBox::stepSelectAll_data() +{ + QTest::addColumn<bool>("stepShouldSelectAll"); + QTest::addColumn<QStringList>("selectedText"); + + QTest::addRow("select all") << true << QStringList{"1", "0", "5", "4", "9"}; + QTest::addRow("don't select all") << false << QStringList{{}, {}, {}, {}, "94"}; +} + +void tst_QSpinBox::stepSelectAll() +{ + QFETCH(bool, stepShouldSelectAll); + QFETCH(QStringList, selectedText); + SelectAllOnStepStyle style(stepShouldSelectAll); + + SpinBox spinBox; + spinBox.setStyle(&style); + + QCOMPARE(spinBox.lineEdit()->selectedText(), QString()); + + auto it = selectedText.cbegin(); + spinBox.stepUp(); + QCOMPARE(spinBox.lineEdit()->selectedText(), *(it++)); + spinBox.lineEdit()->deselect(); + spinBox.stepDown(); + QCOMPARE(spinBox.lineEdit()->selectedText(), *(it++)); + spinBox.lineEdit()->deselect(); + spinBox.stepBy(5); + QCOMPARE(spinBox.lineEdit()->selectedText(), *(it++)); + spinBox.lineEdit()->deselect(); + QTest::keyClick(&spinBox, Qt::Key_Down); + QCOMPARE(spinBox.lineEdit()->selectedText(), *(it++)); + QTest::keyClicks(&spinBox, "9"); + QCOMPARE(spinBox.lineEdit()->selectedText(), QString()); + QCOMPARE(spinBox.lineEdit()->text(), *(it++)); +} + QTEST_MAIN(tst_QSpinBox) #include "tst_qspinbox.moc" |