equal
deleted
inserted
replaced
639 QSizeF QGraphicsGridLayout::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const |
639 QSizeF QGraphicsGridLayout::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const |
640 { |
640 { |
641 Q_D(const QGraphicsGridLayout); |
641 Q_D(const QGraphicsGridLayout); |
642 qreal left, top, right, bottom; |
642 qreal left, top, right, bottom; |
643 getContentsMargins(&left, &top, &right, &bottom); |
643 getContentsMargins(&left, &top, &right, &bottom); |
644 return d->engine.sizeHint(d->styleInfo(), which , constraint) + QSizeF(left + right, top + bottom); |
644 const QSizeF extraMargins(left + right, top + bottom); |
|
645 return d->engine.sizeHint(d->styleInfo(), which , constraint - extraMargins) + extraMargins; |
645 } |
646 } |
646 |
647 |
647 |
648 |
648 #if 0 |
649 #if 0 |
649 // ### kill? (implement and kill?) |
650 // ### kill? (implement and kill?) |