always resize the graphics widget when the dialog does, unless we're resizing the dialog because the graphics widget did

svn path=/trunk/KDE/kdelibs/; revision=1047713
This commit is contained in:
Aaron J. Seigo 2009-11-11 21:45:45 +00:00
parent b0c24dd7a2
commit def1a43dc1

View File

@ -91,7 +91,7 @@ public:
QGraphicsWidget *graphicsWidget;
Dialog::ResizeCorners resizeCorners;
QMap<Dialog::ResizeCorner, QRect> resizeAreas;
Dialog::ResizeCorner resizeStartCorner;
int resizeStartCorner;
QTimer *moveTimer;
};
@ -189,6 +189,8 @@ void DialogPrivate::themeChanged()
void DialogPrivate::adjustView()
{
if (view && graphicsWidget) {
const int prevStartCorner = resizeStartCorner;
resizeStartCorner = -1;
QSize prevSize = q->size();
/*
kDebug() << "Widget size:" << graphicsWidget->size()
@ -239,6 +241,7 @@ void DialogPrivate::adjustView()
//the size of the dialog has changed, emit the signal:
emit q->dialogResized();
}
resizeStartCorner = prevStartCorner;
}
}
@ -383,7 +386,7 @@ void Dialog::resizeEvent(QResizeEvent *e)
setMask(d->background->mask());
if (d->resizeStartCorner != Dialog::NoCorner && d->view && d->graphicsWidget) {
if (d->resizeStartCorner != -1 && d->view && d->graphicsWidget) {
d->graphicsWidget->resize(d->view->size());
QRectF sceneRect(d->graphicsWidget->sceneBoundingRect());