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

Fix placeholder text in QTextBrowser

Browse Source 
Task-number: QTBUG-34051
Change-Id: Ief55cda861ef293a5fdeb2e5fa287b835c729894
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
This commit is contained in:
J-P Nurmi 2013-11-05 11:22:34 +01:00 committed by The Qt Project
parent 94ad841ab5
commit 71ce869825
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/widgets/widgets/qtextedit.cpp
View File

@ -1513,6 +1513,14 @@ void QTextEditPrivate::paint(QPainter *p, QPaintEvent *e)
if (layout) if (layout)
layout->setViewport(QRect()); layout->setViewport(QRect());
if (!placeholderText.isEmpty() && doc->isEmpty()) {
QColor col = control->palette().text().color();
col.setAlpha(128);
p->setPen(col);
const int margin = int(doc->documentMargin());
p->drawText(viewport->rect().adjusted(margin, margin, -margin, -margin), Qt::AlignTop | Qt::TextWordWrap, placeholderText);
}
} }
/*! \fn void QTextEdit::paintEvent(QPaintEvent *event) /*! \fn void QTextEdit::paintEvent(QPaintEvent *event)
@ -1528,13 +1536,6 @@ void QTextEdit::paintEvent(QPaintEvent *e)
Q_D(QTextEdit); Q_D(QTextEdit);
QPainter p(d->viewport); QPainter p(d->viewport);
d->paint(&p, e); d->paint(&p, e);
if (!d->placeholderText.isEmpty() && d->control->document()->isEmpty()) {
QColor col = palette().text().color();
col.setAlpha(128);
p.setPen(col);
const int margin = int(document()->documentMargin());
p.drawText(d->viewport->rect().adjusted(margin, margin, -margin, -margin), Qt::AlignTop | Qt::TextWordWrap, d->placeholderText);
}
} }
void QTextEditPrivate::_q_currentCharFormatChanged(const QTextCharFormat &fmt) void QTextEditPrivate::_q_currentCharFormatChanged(const QTextCharFormat &fmt)