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

QFontDialog: use QSignalBlocker

Browse Source 
Change-Id: I7be3ac4a7e6988d768e1db68f10a6920aa825a76
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
This commit is contained in:
Marc Mutz 2013-10-25 19:48:05 +02:00 committed by The Qt Project
parent 4003d44ca2
commit 8d7b0a8c3e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/widgets/dialogs/qfontdialog.cpp
View File

@ -632,12 +632,11 @@ void QFontDialogPrivate::updateSizes()
} }
sizeList->setCurrentItem(current); sizeList->setCurrentItem(current);
sizeEdit->blockSignals(true); const QSignalBlocker blocker(sizeEdit);
sizeEdit->setText((smoothScalable ? QString::number(size) : sizeList->currentText())); sizeEdit->setText((smoothScalable ? QString::number(size) : sizeList->currentText()));
if (q->style()->styleHint(QStyle::SH_FontDialog_SelectAssociatedText, 0, q) if (q->style()->styleHint(QStyle::SH_FontDialog_SelectAssociatedText, 0, q)
&& sizeList->hasFocus()) && sizeList->hasFocus())
sizeEdit->selectAll(); sizeEdit->selectAll();
sizeEdit->blockSignals(false);
} else { } else {
sizeEdit->clear(); sizeEdit->clear();
} }
@ -750,9 +749,8 @@ void QFontDialogPrivate::_q_sizeChanged(const QString &s)
if (sizeList->text(i).toInt() >= this->size) if (sizeList->text(i).toInt() >= this->size)
break; break;
} }
sizeList->blockSignals(true); const QSignalBlocker blocker(sizeList);
sizeList->setCurrentItem(i); sizeList->setCurrentItem(i);
sizeList->blockSignals(false);
} }
_q_updateSample(); _q_updateSample();
} }