alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

-make sure hints are invalidated when the inner widget resizes

Browse Source 
-the size hint should take into account the -double- border

svn path=/trunk/KDE/kdelibs/; revision=1112548
This commit is contained in:
Marco Martin 2010-04-08 13:14:55 +00:00
parent cf414512b7
commit 192052b0b7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
widgets/scrollwidget.cpp
View File

@ -1234,6 +1234,7 @@ bool ScrollWidget::eventFilter(QObject *watched, QEvent *event)
if (watched == d->widget.data() && event->type() == QEvent::GraphicsSceneResize) {
d->adjustScrollbarsTimer->start(200);
updateGeometry();
} else if (watched == d->widget.data() && event->type() == QEvent::GraphicsSceneMove) {
d->horizontalScrollBar->blockSignals(true);
d->verticalScrollBar->blockSignals(true);
@ -1255,7 +1256,7 @@ QSizeF ScrollWidget::sizeHint(Qt::SizeHint which, const QSizeF & constraint) con
return QSizeF(KIconLoader::SizeEnormous, KIconLoader::SizeEnormous);
}
QSizeF hint = d->widget.data()->effectiveSizeHint(which, constraint)+QSize(d->borderSize, d->borderSize);
QSizeF hint = d->widget.data()->effectiveSizeHint(which, constraint)+QSize(d->borderSize*2, d->borderSize*2);
if (d->horizontalScrollBar && d->horizontalScrollBar->isVisible()) {
hint += QSize(0, d->horizontalScrollBar->size().height());
}