remove magic numbers
svn path=/trunk/KDE/kdelibs/; revision=1045319
This commit is contained in:
parent
7acbfbc47f
commit
5789ff1883
@ -151,10 +151,10 @@ public:
|
|||||||
QSizeF widgetSize = widget->size();
|
QSizeF widgetSize = widget->size();
|
||||||
if (widget->sizePolicy().expandingDirections() & Qt::Horizontal) {
|
if (widget->sizePolicy().expandingDirections() & Qt::Horizontal) {
|
||||||
//keep a 1 pixel border
|
//keep a 1 pixel border
|
||||||
widgetSize.setWidth(scrollingWidget->size().width()-4);
|
widgetSize.setWidth(scrollingWidget->size().width()-borderSize);
|
||||||
}
|
}
|
||||||
if (widget->sizePolicy().expandingDirections() & Qt::Vertical) {
|
if (widget->sizePolicy().expandingDirections() & Qt::Vertical) {
|
||||||
widgetSize.setHeight(scrollingWidget->size().height()-4);
|
widgetSize.setHeight(scrollingWidget->size().height()-borderSize);
|
||||||
}
|
}
|
||||||
widget->resize(widgetSize);
|
widget->resize(widgetSize);
|
||||||
}
|
}
|
||||||
@ -229,6 +229,7 @@ public:
|
|||||||
QRectF rectToBeVisible;
|
QRectF rectToBeVisible;
|
||||||
bool dragging;
|
bool dragging;
|
||||||
int animId;
|
int animId;
|
||||||
|
static const int borderSize = 4;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@ -480,7 +481,7 @@ QSizeF ScrollWidget::sizeHint(Qt::SizeHint which, const QSizeF & constraint) con
|
|||||||
QSizeF hint = QGraphicsWidget::sizeHint(which, constraint);
|
QSizeF hint = QGraphicsWidget::sizeHint(which, constraint);
|
||||||
|
|
||||||
if (which == Qt::PreferredSize && d->widget) {
|
if (which == Qt::PreferredSize && d->widget) {
|
||||||
return (d->widget->size()+QSize(4,4)).expandedTo(d->widget->effectiveSizeHint(Qt::PreferredSize));
|
return (d->widget->size()+QSize(d->borderSize, d->borderSize)).expandedTo(d->widget->effectiveSizeHint(Qt::PreferredSize));
|
||||||
}
|
}
|
||||||
|
|
||||||
return hint;
|
return hint;
|
||||||
|
Loading…
Reference in New Issue
Block a user