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

Don't use obsolete QStyle::PixelMetric enum items

Browse Source 
There is only one place in Qt Widgets where they are still present -
QProgressDialogPrivate::layout().

Change-Id: I53742dd6d5a61e468a90c6a487cf2a67f89b244c
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
This commit is contained in:
Alexander Volkov 2014-09-22 14:04:34 +04:00
parent a02863234d
commit 17d3825874
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/widgets/dialogs/qprogressdialog.cpp
View File

@ -138,9 +138,10 @@ void QProgressDialogPrivate::init(const QString &labelText, const QString &cance
void QProgressDialogPrivate::layout() void QProgressDialogPrivate::layout()
{ {
Q_Q(QProgressDialog); Q_Q(QProgressDialog);
int sp = q->style()->pixelMetric(QStyle::PM_DefaultLayoutSpacing); int sp = q->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing, 0, q);
int mtb = q->style()->pixelMetric(QStyle::PM_DefaultTopLevelMargin); int mb = q->style()->pixelMetric(QStyle::PM_LayoutBottomMargin, 0, q);
int mlr = qMin(q->width() / 10, mtb); int ml = qMin(q->width() / 10, q->style()->pixelMetric(QStyle::PM_LayoutLeftMargin, 0, q));
int mr = qMin(q->width() / 10, q->style()->pixelMetric(QStyle::PM_LayoutRightMargin, 0, q));
const bool centered = const bool centered =
bool(q->style()->styleHint(QStyle::SH_ProgressDialog_CenterCancelButton, 0, q)); bool(q->style()->styleHint(QStyle::SH_ProgressDialog_CenterCancelButton, 0, q));
@ -154,12 +155,12 @@ void QProgressDialogPrivate::layout()
// dialog can be made very small if the user demands it so. // dialog can be made very small if the user demands it so.
for (int attempt=5; attempt--;) { for (int attempt=5; attempt--;) {
cspc = cancel ? cs.height() + sp : 0; cspc = cancel ? cs.height() + sp : 0;
lh = qMax(0, q->height() - mtb - bh.height() - sp - cspc); lh = qMax(0, q->height() - mb - bh.height() - sp - cspc);
if (lh < q->height()/4) { if (lh < q->height()/4) {
// Getting cramped // Getting cramped
sp /= 2; sp /= 2;
mtb /= 2; mb /= 2;
if (cancel) { if (cancel) {
cs.setHeight(qMax(4,cs.height()-sp-2)); cs.setHeight(qMax(4,cs.height()-sp-2));
} }
@ -171,14 +172,14 @@ void QProgressDialogPrivate::layout()
if (cancel) { if (cancel) {
cancel->setGeometry( cancel->setGeometry(
centered ? q->width()/2 - cs.width()/2 : q->width() - mlr - cs.width(), centered ? q->width()/2 - cs.width()/2 : q->width() - mr - cs.width(),
q->height() - mtb - cs.height(), q->height() - mb - cs.height(),
cs.width(), cs.height()); cs.width(), cs.height());
} }
if (label) if (label)
label->setGeometry(mlr, additionalSpacing, q->width() - mlr * 2, lh); label->setGeometry(ml, additionalSpacing, q->width() - ml - mr, lh);
bar->setGeometry(mlr, lh + sp + additionalSpacing, q->width() - mlr * 2, bh.height()); bar->setGeometry(ml, lh + sp + additionalSpacing, q->width() - ml - mr, bh.height());
} }
void QProgressDialogPrivate::retranslateStrings() void QProgressDialogPrivate::retranslateStrings()