diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-06 13:37:48 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-08 04:05:10 +0000 |
| commit | e1a073044855c43ca11e9ada6eedded199c02fc8 (patch) | |
| tree | eaec26e4c730bfd533ffa509319a8e26d10294a7 /src/widgets/widgets/qplaintextedit.cpp | |
| parent | 510d18d7aedc1c7853292395dd0e6b470570cc9d (diff) | |
QPlainTextEdit: not show place holder when having preedit string
Task-number: QTBUG-61210
Change-Id: I4891c21fc4e1923b5929defeacab26114c00a7e3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/widgets/widgets/qplaintextedit.cpp')
| -rw-r--r-- | src/widgets/widgets/qplaintextedit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp index 7e01f6f3d5..746dc20122 100644 --- a/src/widgets/widgets/qplaintextedit.cpp +++ b/src/widgets/widgets/qplaintextedit.cpp @@ -1978,7 +1978,7 @@ void QPlainTextEdit::paintEvent(QPaintEvent *e) } - if (!placeholderText().isEmpty() && document()->isEmpty()) { + if (!placeholderText().isEmpty() && document()->isEmpty() && layout->preeditAreaText().isEmpty()) { Q_D(QPlainTextEdit); QColor col = d->control->palette().text().color(); col.setAlpha(128); |