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

QPlainTextEdit: use QSignalBlocker

Browse Source 
Change-Id: I581e60c4efd985fb909614459229806185f9501c
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
This commit is contained in:
Marc Mutz 2013-10-26 11:07:46 +02:00 committed by The Qt Project
parent a6f0f07782
commit 94fd108ea4
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -639,9 +639,10 @@ void QPlainTextEditPrivate::setTopBlock(int blockNumber, int lineNumber, int dx)
lineNumber = maxTopLine - block.firstLineNumber();
}
bool vbarSignalsBlocked = vbar->blockSignals(true);
vbar->setValue(newTopLine);
vbar->blockSignals(vbarSignalsBlocked);
{
const QSignalBlocker blocker(vbar);
vbar->setValue(newTopLine);
}
if (!dx && blockNumber == control->topBlock && lineNumber == topLine)
return;
@ -657,9 +658,10 @@ void QPlainTextEditPrivate::setTopBlock(int blockNumber, int lineNumber, int dx)
control->topBlock = blockNumber;
topLine = lineNumber;
bool vbarSignalsBlocked = vbar->blockSignals(true);
vbar->setValue(block.firstLineNumber() + lineNumber);
vbar->blockSignals(vbarSignalsBlocked);
{
const QSignalBlocker blocker(vbar);
vbar->setValue(block.firstLineNumber() + lineNumber);
}
if (dx || dy) {
viewport->scroll(q->isRightToLeft() ? -dx : dx, dy);
@ -1006,9 +1008,11 @@ void QPlainTextEditPrivate::_q_adjustScrollbars()
QTextBlock firstVisibleBlock = q->firstVisibleBlock();
if (firstVisibleBlock.isValid())
visualTopLine = firstVisibleBlock.firstLineNumber() + topLine;
bool vbarSignalsBlocked = vbar->blockSignals(true);
vbar->setValue(visualTopLine);
vbar->blockSignals(vbarSignalsBlocked);
{
const QSignalBlocker blocker(vbar);
vbar->setValue(visualTopLine);
}
hbar->setRange(0, (int)documentSize.width() - viewport->width());
hbar->setPageStep(viewport->width());