AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QLineEdit: Make the clear button always the leftmost button

Browse Source 
QLineEditIconButton currently draws a fully transparent pixmap in its
paintEvent() function, when the line edit is empty. This does not work
when there is another trailing QAction that is visible even when the
line edit has no text, as reported in QTBUG-59957.

To fix this issue, make sure the clear button is always the leftmost
button.

Task-number: QTBUG-59957
Change-Id: I8a4f96aae07856aa0e1053ebb338ba9bdf052a16
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Elvis Angelaccio 2017-04-18 10:19:12 +02:00
parent 254f35ce98
commit 288bfb0bbd
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/widgets/widgets/qlineedit_p.cpp
View File

@ -533,6 +533,17 @@ QWidget *QLineEditPrivate::addAction(QAction *newAction, QAction *before, QLineE
return nullptr; return nullptr;
#endif #endif
} }
// QTBUG-59957: clear button should be the leftmost action.
if (!before && !(flags & SideWidgetClearButton) && position == QLineEdit::TrailingPosition) {
for (const SideWidgetEntry &e : trailingSideWidgets) {
if (e.flags & SideWidgetClearButton) {
before = e.action;
break;
}
}
}
// If there is a 'before' action, it takes preference // If there is a 'before' action, it takes preference
// There's a bug in GHS compiler that causes internal error on the following code. // There's a bug in GHS compiler that causes internal error on the following code.

23
tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
View File

@ -310,6 +310,7 @@ private slots:
void shortcutOverrideOnReadonlyLineEdit_data(); void shortcutOverrideOnReadonlyLineEdit_data();
void shortcutOverrideOnReadonlyLineEdit(); void shortcutOverrideOnReadonlyLineEdit();
void QTBUG59957_clearButtonLeftmostAction();
protected slots: protected slots:
void editingFinished(); void editingFinished();
@ -4612,5 +4613,27 @@ void tst_QLineEdit::shortcutOverrideOnReadonlyLineEdit()
QCOMPARE(spy.count(), activationCount); QCOMPARE(spy.count(), activationCount);
} }
void tst_QLineEdit::QTBUG59957_clearButtonLeftmostAction()
{
QLineEdit lineEdit;
lineEdit.setClearButtonEnabled(true);
auto clearButton = lineEdit.findChild<QLineEditIconButton *>();
QVERIFY(clearButton);
QPixmap pixmap(16, 16);
lineEdit.addAction(QIcon(pixmap), QLineEdit::TrailingPosition);
lineEdit.addAction(QIcon(pixmap), QLineEdit::TrailingPosition);
lineEdit.show();
const auto buttons = lineEdit.findChildren<QLineEditIconButton *>();
for (const auto button : buttons) {
if (button == clearButton)
continue;
QVERIFY(clearButton->x() < button->x());
}
}
QTEST_MAIN(tst_QLineEdit) QTEST_MAIN(tst_QLineEdit)
#include "tst_qlineedit.moc" #include "tst_qlineedit.moc"