1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QPlainTextEdit: adjust scroll bars when showing up

Browse Source 
The text of QPlainTextEdit might change when it is invisible, so an
adjustment of scroll bars is needed when the QPlainTextEdit showing
up, otherwise the range of scroll bars might be incorrect.

Fixes: QTBUG-77937
Pick-to: 5.15 6.0 6.1
Change-Id: I45c686c7e09ca7b2944c36122e9157de0ec4f0e0
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
This commit is contained in:
Wang Chuan 2021-02-07 11:05:23 +08:00
parent 222c0ab081
commit 13ae47d980
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/widgets/widgets/qplaintextedit.cpp
View File

@ -2306,6 +2306,7 @@ void QPlainTextEdit::showEvent(QShowEvent *)
d->showCursorOnInitialShow = false; d->showCursorOnInitialShow = false;
ensureCursorVisible(); ensureCursorVisible();
} }
d->_q_adjustScrollbars();
} }
/*! \reimp /*! \reimp

32
tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
View File

@ -153,6 +153,7 @@ private slots:
#ifndef QT_NO_CLIPBOARD #ifndef QT_NO_CLIPBOARD
void updateCursorPositionAfterEdit(); void updateCursorPositionAfterEdit();
#endif #endif
void appendTextWhenInvisible();
private: private:
void createSelection(); void createSelection();
@ -1805,5 +1806,36 @@ void tst_QPlainTextEdit::updateCursorPositionAfterEdit()
} }
#endif #endif
void tst_QPlainTextEdit::appendTextWhenInvisible()
{
QWidget window;
window.resize(640, 480);
QPlainTextEdit *plainTextEdit = new QPlainTextEdit(&window);
plainTextEdit->resize(320, 240);
window.show();
QVERIFY(QTest::qWaitForWindowActive(&window));
// this should be long enough to let vertical scroll bar show up
const QString baseText("text\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\ntext");
const QString textToAppend("aaa");
plainTextEdit->setPlainText(baseText + "\n" + textToAppend);
const auto maxAfterSet = plainTextEdit->verticalScrollBar()->maximum();
// make sure the vertical scroll bar is visible
QVERIFY(maxAfterSet != 0);
plainTextEdit->clear();
plainTextEdit->setPlainText(baseText);
plainTextEdit->hide();
plainTextEdit->appendPlainText(textToAppend);
plainTextEdit->show();
const auto maxAfterAppend = plainTextEdit->verticalScrollBar()->maximum();
QVERIFY(maxAfterAppend != 0);
QCOMPARE(maxAfterAppend, maxAfterSet);
}
QTEST_MAIN(tst_QPlainTextEdit) QTEST_MAIN(tst_QPlainTextEdit)
#include "tst_qplaintextedit.moc" #include "tst_qplaintextedit.moc"