diff options
| author | Filipe Azevedo <filipe.azevedo@kdab.com> | 2018-03-01 11:58:22 +0100 |
|---|---|---|
| committer | Filipe Azevedo <filipe.azevedo@kdab.com> | 2018-05-04 08:53:12 +0000 |
| commit | d2cf056648a1b0a12cfc0d3988bff85c756c40ab (patch) | |
| tree | 2961e588b8e208d36f19dc3344dca8240d8f4101 | |
| parent | ebd3a13b807c6af2684b42d3912549caf7ef82aa (diff) | |
Port placeholder rendering to palette placeholder color role
Change-Id: I7671d4b55677866b61627cc55a3029a3848f455d
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| -rw-r--r-- | src/widgets/widgets/qlineedit.cpp | 3 | ||||
| -rw-r--r-- | src/widgets/widgets/qplaintextedit.cpp | 3 | ||||
| -rw-r--r-- | src/widgets/widgets/qtextedit.cpp | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp index d7c9d7a44c..9e70b54601 100644 --- a/src/widgets/widgets/qlineedit.cpp +++ b/src/widgets/widgets/qlineedit.cpp @@ -1944,8 +1944,7 @@ void QLineEdit::paintEvent(QPaintEvent *) if (!d->placeholderText.isEmpty()) { const Qt::LayoutDirection layoutDir = d->placeholderText.isRightToLeft() ? Qt::RightToLeft : Qt::LeftToRight; const Qt::Alignment alignPhText = QStyle::visualAlignment(layoutDir, QFlag(d->alignment)); - QColor col = pal.text().color(); - col.setAlpha(128); + const QColor col = pal.placeholderText().color(); QPen oldpen = p.pen(); p.setPen(col); Qt::LayoutDirection oldLayoutDir = p.layoutDirection(); diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp index e66b702ffd..f654a12d34 100644 --- a/src/widgets/widgets/qplaintextedit.cpp +++ b/src/widgets/widgets/qplaintextedit.cpp @@ -1925,8 +1925,7 @@ void QPlainTextEdit::paintEvent(QPaintEvent *e) painter.setClipRect(er); if (d->placeholderVisible) { - QColor col = d->control->palette().text().color(); - col.setAlpha(128); + const QColor col = d->control->palette().placeholderText().color(); painter.setPen(col); painter.setClipRect(e->rect()); const int margin = int(document()->documentMargin()); diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp index 95c85dc4fe..6bc4c113ce 100644 --- a/src/widgets/widgets/qtextedit.cpp +++ b/src/widgets/widgets/qtextedit.cpp @@ -1516,8 +1516,7 @@ void QTextEditPrivate::paint(QPainter *p, QPaintEvent *e) layout->setViewport(QRect()); if (!placeholderText.isEmpty() && doc->isEmpty() && !control->isPreediting()) { - QColor col = control->palette().text().color(); - col.setAlpha(128); + const QColor col = control->palette().placeholderText().color(); p->setPen(col); const int margin = int(doc->documentMargin()); p->drawText(viewport->rect().adjusted(margin, margin, -margin, -margin), Qt::AlignTop | Qt::TextWordWrap, placeholderText); |