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

QLineEdit: Extract Method shouldShowPlaceholderText()

Browse Source 
The condition under which the placeholder text should be shown changed recently,
so refactor the code to centralize the condition.

It turns out that setPlaceholderText() and paintEvent() disagree on the condition
already.

Change-Id: Id193a9a138042ab0690082dcf634cf7487a5276e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Marc Mutz 2013-11-26 12:31:01 +01:00 committed by The Qt Project
parent 1c046369e3
commit 6f54244660
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/widgets/widgets/qlineedit.cpp
View File

@ -350,7 +350,7 @@ void QLineEdit::setPlaceholderText(const QString& placeholderText)
Q_D(QLineEdit);
if (d->placeholderText != placeholderText) {
d->placeholderText = placeholderText;
if (d->control->text().isEmpty())
if (d->shouldShowPlaceholderText())
update();
}
}
@ -1895,7 +1895,7 @@ void QLineEdit::paintEvent(QPaintEvent *)
int minLB = qMax(0, -fm.minLeftBearing());
int minRB = qMax(0, -fm.minRightBearing());
if (d->control->text().isEmpty() && d->control->preeditAreaText().isEmpty()) {
if (d->shouldShowPlaceholderText() && d->control->preeditAreaText().isEmpty()) {
if (!d->placeholderText.isEmpty()) {
QColor col = pal.text().color();
col.setAlpha(128);

4
src/widgets/widgets/qlineedit_p.h
View File

@ -148,6 +148,10 @@ public:
{
return !control->isReadOnly();
}
inline bool shouldShowPlaceholderText() const
{
return control->text().isEmpty();
}
static inline QLineEditPrivate *get(QLineEdit *lineEdit) {
return lineEdit->d_func();